diff options
| author | Steve Dickson <steved@redhat.com> | 2016-06-08 09:18:35 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-06-08 09:22:00 -0400 |
| commit | 6a648d46c0fcf28d76e80c4d7eb6509373f3e024 (patch) | |
| tree | 074a131b4903f4fc87816290fc34b8328bfbebba | |
| parent | a5f1e5797f465d326043eb9daa5f1ad3750d4c9d (diff) | |
| download | nfs-utils-6a648d46c0fcf28d76e80c4d7eb6509373f3e024.tar.gz nfs-utils-6a648d46c0fcf28d76e80c4d7eb6509373f3e024.tar.xz nfs-utils-6a648d46c0fcf28d76e80c4d7eb6509373f3e024.zip | |
nfsidmap: added the -h option
Use the correct exit code when an invalid option
use or the -h option.
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/nfsidmap/nfsidmap.c | 7 | ||||
| -rw-r--r-- | utils/nfsidmap/nfsidmap.man | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c index 2abefe9..63545fc 100644 --- a/utils/nfsidmap/nfsidmap.c +++ b/utils/nfsidmap/nfsidmap.c @@ -17,7 +17,7 @@ #include "conffile.h" int verbose = 0; -char *usage = "Usage: %s [-v] [-c || [-u|-g|-r key] || -d || -l || [-t timeout] key desc]"; +char *usage = "Usage: %s [-vh] [-c || [-u|-g|-r key] || -d || -l || [-t timeout] key desc]"; #define MAX_ID_LEN 11 #define IDMAP_NAMESZ 128 @@ -369,7 +369,7 @@ int main(int argc, char **argv) xlog_open(progname); - while ((opt = getopt(argc, argv, "du:g:r:ct:vl")) != -1) { + while ((opt = getopt(argc, argv, "hdu:g:r:ct:vl")) != -1) { switch (opt) { case 'd': display++; @@ -398,9 +398,10 @@ int main(int argc, char **argv) case 't': timeout = atoi(optarg); break; + case 'h': default: xlog_warn(usage, progname); - break; + exit(opt == 'h' ? 0 : 1); } } diff --git a/utils/nfsidmap/nfsidmap.man b/utils/nfsidmap/nfsidmap.man index 0275bdf..2f17cf2 100644 --- a/utils/nfsidmap/nfsidmap.man +++ b/utils/nfsidmap/nfsidmap.man @@ -15,6 +15,8 @@ nfsidmap \- The NFS idmapper upcall program .B "nfsidmap -d" .br .B "nfsidmap -l" +.br +.B "nfsidmap -h" .SH DESCRIPTION The NFSv4 protocol represents the local system's UID and GID values on the wire as strings of the form @@ -71,6 +73,9 @@ Display the system's effective NFSv4 domain name on .B -g user Revoke the gid key of the given user. .TP +.B -h +Display usage message. +.TP .B -l Display on .I stdout |