[PATCH 0/2] gssd, statd: correct command help text

[PATCH 0/2] gssd, statd: correct command help text

[Prabhakar Pujeri]

Bring the command help in line with the options accepted by rpc.gssd and
rpc.statd.  The first patch removes a stale rpc.gssd option and adds its
timeout option.  The second adds the existing NLM port options to rpc.statd
usage output.

The series is based on current nfs-utils master.  A fresh autotools build
and make check complete successfully; the statd integration test is skipped
when its required service environment is unavailable.

Prabhakar Pujeri (2):
  gssd: sync usage() and man page synopsis with actual options
  statd: document the NLM port options in usage()

 utils/gssd/gssd.c   | 2 +-
 utils/gssd/gssd.man | 2 +-
 utils/statd/statd.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

-- 
2.55.0

[PATCH 1/2] gssd: sync usage() and man page synopsis with actual options

[Prabhakar Pujeri]

The getopt string no longer contains 'l', so the '-l' advertised by
usage() and the rpc.gssd(8) synopsis only earns users an "invalid
option".  Conversely, the -T rpc-timeout option exists but was never
added to usage().

Drop the stale -l from both places and document -T.

Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@dell.com>
---
 utils/gssd/gssd.c   | 2 +-
 utils/gssd/gssd.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index a0a65014..a5165c0a 100644
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -1023,7 +1023,7 @@ sig_die(int signal)
 static void
 usage(char *progname)
 {
-	fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm] [-D] [-H] [-U upcall timeout] [-C]\n",
+	fprintf(stderr, "usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-T rpc-timeout] [-R preferred realm] [-D] [-H] [-U upcall timeout] [-C]\n",
 		progname);
 	exit(1);
 }
diff --git a/utils/gssd/gssd.man b/utils/gssd/gssd.man
index 57ad30cf..73ae02ca 100644
--- a/utils/gssd/gssd.man
+++ b/utils/gssd/gssd.man
@@ -8,7 +8,7 @@
 rpc.gssd \- RPCSEC_GSS daemon
 .SH SYNOPSIS
 .B rpc.gssd
-.RB [ \-DfMnlvrHC ]
+.RB [ \-DfMnvrHC ]
 .RB [ \-k
 .IR keytab ]
 .RB [ \-p
-- 
2.55.0

[PATCH 2/2] statd: document the NLM port options in usage()

[Prabhakar Pujeri]

rpc.statd accepts -T/--nlm-port and -U/--nlm-udp-port and both are
described in rpc.statd(8), but usage() never mentions them.

Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@dell.com>
---
 utils/statd/statd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index a469a67a..fa43ba17 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -153,6 +153,8 @@ usage(void)
 	fprintf(stderr,"      -d, --no-syslog      Verbose logging to stderr.  Foreground mode only.\n");
 	fprintf(stderr,"      -p, --port           Port to listen on\n");
 	fprintf(stderr,"      -o, --outgoing-port  Port for outgoing connections\n");
+	fprintf(stderr,"      -T, --nlm-port       NLM TCP port (and UDP, unless set separately)\n");
+	fprintf(stderr,"      -U, --nlm-udp-port   NLM UDP port\n");
 	fprintf(stderr,"      -V, -v, --version    Display version information and exit.\n");
 	fprintf(stderr,"      -n, --name           Specify a local hostname.\n");
 	fprintf(stderr,"      -P                   State directory path.\n");
-- 
2.55.0