[nfs-utils] nfsidmap: default domain no being set (bz 829362)

[Steve Dickson]

commit 798d0101bedb1e108b8023f8445de55c8423d5c8
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Jul 5 15:51:45 2012 -0400

    nfsidmap: default domain no being set (bz 829362)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils-1.2.6-nfsidmap-nodns.patch |   70 ++++++++++++++++++++++++++++++++++
 nfs-utils.spec                       |    7 +++-
 2 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/nfs-utils-1.2.6-nfsidmap-nodns.patch b/nfs-utils-1.2.6-nfsidmap-nodns.patch
new file mode 100644
index 0000000..42691fe
--- /dev/null
+++ b/nfs-utils-1.2.6-nfsidmap-nodns.patch
@@ -0,0 +1,70 @@
+nfs-util: Update exportfs flush option list in usage message.
+
+Update exportfs flush option list in usage message.
+And I sort these cases in alphabetical order.
+
+Signed-off-by: Namjae Jeon <linkinjeon at gmail.com>
+Signed-off-by: Amit Sahrawat <amit.sahrawat83 at gmail.com>
+---
+ utils/exportfs/exportfs.c |   21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
+index a3323d7..9f79541 100644
+--- a/utils/exportfs/exportfs.c
++++ b/utils/exportfs/exportfs.c
+@@ -40,7 +40,7 @@ static void	unexportfs(char *arg, int verbose);
+ static void	exports_update(int verbose);
+ static void	dump(int verbose);
+ static void	error(nfs_export *exp, int err);
+-static void	usage(const char *progname);
++static void	usage(const char *progname, int n);
+ static void	validate_export(nfs_export *exp);
+ static int	matchhostname(const char *hostname1, const char *hostname2);
+ static void	export_d_read(const char *dname);
+@@ -105,11 +105,17 @@ main(int argc, char **argv)
+ 
+ 	export_errno = 0;
+ 
+-	while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) {
++	while ((c = getopt(argc, argv, "afhio:ruv")) != EOF) {
+ 		switch(c) {
+ 		case 'a':
+ 			f_all = 1;
+ 			break;
++		case 'f':
++			force_flush = 1;
++			break;
++		case 'h':
++			usage(progname, 0);
++			break;
+ 		case 'i':
+ 			f_ignore = 1;
+ 			break;
+@@ -126,11 +132,8 @@ main(int argc, char **argv)
+ 		case 'v':
+ 			f_verbose = 1;
+ 			break;
+-		case 'f':
+-			force_flush = 1;
+-			break;
+ 		default:
+-			usage(progname);
++			usage(progname, 1);
+ 			break;
+ 		}
+ 	}
+@@ -723,8 +726,8 @@ error(nfs_export *exp, int err)
+ }
+ 
+ static void
+-usage(const char *progname)
++usage(const char *progname, int n)
+ {
+-	fprintf(stderr, "usage: %s [-aruv] [host:/path]\n", progname);
+-	exit(1);
++	fprintf(stderr, "usage: %s [-afhioruv] [host:/path]\n", progname);
++	exit(n);
+ }
+
+
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 705340b..b15d4b8 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -39,6 +39,7 @@ Source52: nfs-server.postconfig
 Source60: nfs4-modalias.conf
 
 Patch001: nfs-utils-1.2.7-rc2.patch
+Patch002: nfs-utils-1.2.6-nfsidmap-nodns.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -96,6 +97,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %setup -q
 
 %patch001 -p1
+%patch002 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -305,6 +307,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Jul  5 2012 Steve Dickson <steved at redhat.com> 1.2.6-8
+- nfsidmap: default domain no being set (bz 829362)
+
 * Fri Jun 22 2012 Steve Dickson <steved at redhat.com> 1.2.6-7
 - Reworked how the legacy names are enabled in systemd
 - Fixed typo in nfs-mountd.service