[nfs-utils/f17] nfsidmap: default domain not being set (bz 829362)

[Steve Dickson]

commit 8f0bf6a2f080b7883b8ef2d1ec52240695fae3c8
Author: Steve Dickson <steved at redhat.com>
Date:   Sun Oct 14 13:37:26 2012 -0400

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

 nfs-utils-1.2.6-nfsimap-domain.patch |   51 ++++++++++++++++++++++++++++++++++
 nfs-utils.spec                       |    8 ++++-
 2 files changed, 57 insertions(+), 2 deletions(-)
---
diff --git a/nfs-utils-1.2.6-nfsimap-domain.patch b/nfs-utils-1.2.6-nfsimap-domain.patch
new file mode 100644
index 0000000..d68088d
--- /dev/null
+++ b/nfs-utils-1.2.6-nfsimap-domain.patch
@@ -0,0 +1,51 @@
+commit fd27c638898010438d404cd17120729ef1d680e2
+Author: Steve Dickson <steved at redhat.com>
+Date:   Thu Jul 5 08:58:47 2012 -0400
+
+    nfsidmap: Default domain not being set.
+    
+    nfsidmap is not calling the nfs4_init_name_mapping()
+    function which initializes the default domain from
+    either the DNS domain or the Domain variable in /etc/idmap.conf
+    
+    Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c
+index b767395..e14543c 100644
+--- a/utils/nfsidmap/nfsidmap.c
++++ b/utils/nfsidmap/nfsidmap.c
+@@ -37,17 +37,6 @@ static int keyring_clear(char *keyring);
+ #define GIDKEYS 0x2
+ 
+ /*
+- * Check to the config file for the verbosity level
+- */
+-int
+-get_config_verbose(char *path)
+-{
+-	conf_path = path;
+-	conf_init();
+-	return conf_get_num("General", "Verbosity", 0);
+-}
+-
+-/*
+  * Find either a user or group id based on the name at domain string
+  */
+ int id_lookup(char *name_at_domain, key_serial_t key, int type)
+@@ -282,9 +271,14 @@ int main(int argc, char **argv)
+ 			break;
+ 		}
+ 	}
+-	if (!verbose) {
+-		verbose = get_config_verbose(PATH_IDMAPDCONF);
++
++	if (nfs4_init_name_mapping(PATH_IDMAPDCONF))  {
++		xlog_err("Unable to create name to user id mappings.");
++		return 1;
+ 	}
++	if (!verbose)
++		verbose = conf_get_num("General", "Verbosity", 0);
++
+ 	if (keystr) {
+ 		rc = key_revoke(keystr, keymask);
+ 		return rc;		
diff --git a/nfs-utils.spec b/nfs-utils.spec
index cb38617..5f2209f 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: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -40,6 +40,7 @@ Source60: nfs4-modalias.conf
 
 Patch001: nfs-utils-1.2.7-rc2.patch
 Patch002: nfs-utils-1.2.6-nfsidmap-nodns.patch 
+Patch003: nfs-utils-1.2.6-nfsimap-domain.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -98,6 +99,7 @@ This package also contains the mount.nfs and umount.nfs program.
 
 %patch001 -p1
 %patch002 -p1
+%patch003 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -307,8 +309,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Oct 13 2012 Steve Dickson <steved at redhat.com> 1.2.6-5
+- nfsidmap: default domain not being set (bz 829362) 
+
 * Thu Jul  5 2012 Steve Dickson <steved at redhat.com> 1.2.6-4
-- nfsidmap: default domain no being set (bz 829362) 
 - Updated to latest upstream RC release: nfs-utils.1.2.7-rc2 (bz 833555)
 
 * Fri Jun 22 2012 Steve Dickson <steved at redhat.com> 1.2.6-3