Skip to contentSkip to conversation

Document nfnl_osf utility

PATCH In review Phil Sutter 2 participants 4 messages Sep 20, 2017 – Oct 4, 2017 netfilter

lore
Share & tools
lore

Phil Sutter

author reviewer
#0 lore raw

cover Document nfnl_osf utility

This series fixes nfnl_osf help output a bit and introduces a (short) man page.

Phil Sutter (2):
utils: nfnl_osf: Fix synopsis in help text
utils: Add a man page for nfnl_osf

 configure.ac        |  3 ++-
 utils/.gitignore    |  1 +
 utils/Makefile.am   |  4 ++++
 utils/nfnl_osf.8.in | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 utils/nfnl_osf.c    |  2 +-
 5 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 utils/nfnl_osf.8.in
Signature · 1 line
2.13.1
author reviewer
#1 lore raw

PATCH 1/2 utils: nfnl_osf: Fix synopsis in help text

* -d is optional
* -h is not really a flag, just anything not recognized triggers the help output.
* That '<del rules>' bit is rather confusing than helpful.

Signed-off-by Phil Sutter <[email protected]>
---
 utils/nfnl_osf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
utils/nfnl_osf.c +1 -1
index 645ec648fcc63..720e3a38dbd36 100644
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
 				break;
 			default:
 				fprintf(stderr,
-					"Usage: %s -f fingerprints -d <del rules> -h\n",
+					"Usage: %s -f fingerprints [-d]\n",
 					argv[0]);
 				return -1;
 		}
Signature · 1 line
2.13.1
author reviewer
#2 lore raw

PATCH 2/2 utils: Add a man page for nfnl_osf

In reply to Phil Sutter
Signed-off-by Phil Sutter <[email protected]>
---
 configure.ac        |  3 ++-
 utils/.gitignore    |  1 +
 utils/Makefile.am   |  4 ++++
 utils/nfnl_osf.8.in | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 utils/nfnl_osf.8.in
configure.ac +2 -1
index 221812a8f3f1f..9ca74743108ee 100644
@@ -248,7 +248,8 @@ AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile
 	libiptc/Makefile libiptc/libiptc.pc
 	libiptc/libip4tc.pc libiptc/libip6tc.pc
 	libxtables/Makefile utils/Makefile
-	include/xtables-version.h include/iptables/internal.h])
+	include/xtables-version.h include/iptables/internal.h
+	utils/nfnl_osf.8])
 AC_OUTPUT
utils/.gitignore +1 -0
index 216d1e4a621ed..7c6afbf4e6a52 100644
@@ -1,2 +1,3 @@
 /nfnl_osf
+/nfnl_osf.8
 /nfbpf_compile
utils/Makefile.am +4 -0
index c4192a9e73688..80029e303ff3b 100644
@@ -6,8 +6,10 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include \
 
 sbin_PROGRAMS =
 pkgdata_DATA =
+man_MANS =
 
 if HAVE_LIBNFNETLINK
+man_MANS += nfnl_osf.8
 sbin_PROGRAMS += nfnl_osf
 pkgdata_DATA += pf.os
 

@@ -23,3 +25,5 @@ if ENABLE_SYNCONF
 sbin_PROGRAMS += nfsynproxy
 nfsynproxy_LDADD = -lpcap
 endif
+
+CLEANFILES = nfnl_osf.8
utils/nfnl_osf.8.in new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.13.1