851484
diff -up nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c.orig nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c
851484
--- nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c.orig	2016-06-08 09:59:09.920690710 -0400
851484
+++ nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.c	2016-06-08 11:22:01.104971559 -0400
851484
@@ -16,7 +16,7 @@
851484
 #include "conffile.h"
851484
 
851484
 int verbose = 0;
851484
-char *usage = "Usage: %s [-v] [-c || [-u|-g|-r key] || -d || -l || [-t timeout] key desc]";
851484
+char *usage = "Usage: %s [-vh] [-c || [-u|-g|-r key] || -d || -l || [-t timeout] key desc]";
851484
 
851484
 #define MAX_ID_LEN   11
851484
 #define IDMAP_NAMESZ 128
851484
@@ -355,7 +355,7 @@ int main(int argc, char **argv)
851484
 
851484
 	xlog_open(progname);
851484
 
851484
-	while ((opt = getopt(argc, argv, "du:g:r:ct:vl")) != -1) {
851484
+	while ((opt = getopt(argc, argv, "hdu:g:r:ct:vl")) != -1) {
851484
 		switch (opt) {
851484
 		case 'd':
851484
 			display++;
851484
@@ -384,9 +384,10 @@ int main(int argc, char **argv)
851484
 		case 't':
851484
 			timeout = atoi(optarg);
851484
 			break;
851484
+		case 'h':
851484
 		default:
851484
 			xlog_warn(usage, progname);
851484
-			break;
851484
+			exit(opt == 'h' ? 0 : 1);
851484
 		}
851484
 	}
851484
 
851484
diff -up nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.man.orig nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.man
851484
--- nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.man.orig	2016-06-08 09:59:09.899690366 -0400
851484
+++ nfs-utils-1.3.0/utils/nfsidmap/nfsidmap.man	2016-06-08 11:22:01.104971559 -0400
851484
@@ -15,6 +15,8 @@ nfsidmap \- The NFS idmapper upcall prog
851484
 .B "nfsidmap -d"
851484
 .br
851484
 .B "nfsidmap -l"
851484
+.br
851484
+.B "nfsidmap -h"
851484
 .SH DESCRIPTION
851484
 The NFSv4 protocol represents the local system's UID and GID values
851484
 on the wire as strings of the form
851484
@@ -71,6 +73,9 @@ Display the system's effective NFSv4 dom
851484
 .B -g user
851484
 Revoke the gid key of the given user.
851484
 .TP
851484
+.B -h
851484
+Display usage message.
851484
+.TP
851484
 .B -l
851484
 Display on
851484
 .I stdout