rpms/nfs-utils-lib/F-9 nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch, NONE, 1.1 nfs-utils-lib.spec, 1.31, 1.32 nfs-utils-lib-1.1.1-idmapd-domain-dns.patch, 1.1, NONE

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32566

Modified Files:
	nfs-utils-lib.spec 
Added Files:
	nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch 
Removed Files:
	nfs-utils-lib-1.1.1-idmapd-domain-dns.patch 
Log Message:
- Stop idmapd from exiting when a valid v4 domain is not found (bz 454508)


nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch:

--- NEW FILE nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch ---
diff -up nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c.orig nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c
--- nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c.orig	2006-09-05 10:09:00.000000000 -0400
+++ nfs-utils-lib-1.1.1/libnfsidmap/libnfsidmap.c	2008-07-11 12:32:49.000000000 -0400
@@ -54,6 +54,10 @@
 /* forward declarations */
 int set_trans_method(char *);
 
+#ifndef IDMAPD_DEFAULT_DOMAIN
+#define IDMAPD_DEFAULT_DOMAIN "localdomain"
+#endif
+
 static char *default_domain;
 
 #ifndef PATH_IDMAPDCONF
@@ -109,10 +113,12 @@ int nfs4_init_name_mapping(char *conffil
 		dflt = 1;
 		ret = domain_from_dns(&default_domain);
 		if (ret) {
-			IDMAP_LOG(0, ("libnfsidmap: Unable to determine "
-				  "a default nfsv4 domain; consider "
-				  "specifying one in idmapd.conf\n"));
-			return ret;
+			IDMAP_LOG(1, ("libnfsidmap: Unable to determine "
+				  "the NFSv4 domain; Using '%s' as the NFSv4 domain "
+				  "which means UIDs will be mapped to the 'Nobody-User' "
+				  "user defined in %s\n", 
+				  IDMAPD_DEFAULT_DOMAIN, PATH_IDMAPDCONF));
+			default_domain = IDMAPD_DEFAULT_DOMAIN;
 		}
 	}
 	IDMAP_LOG(1, ("libnfsidmap: using%s domain: %s\n",


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-9/nfs-utils-lib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nfs-utils-lib.spec	10 Jul 2008 17:55:21 -0000	1.31
+++ nfs-utils-lib.spec	11 Jul 2008 16:36:54 -0000	1.32
@@ -19,7 +19,7 @@
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
 Patch00: nfs-utils-lib-1.0.8-idmap.conf.patch
-Patch01: nfs-utils-lib-1.1.1-idmapd-domain-dns.patch
+Patch01: nfs-utils-lib-1.1.1-libnfsidmap-nodomain.patch
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -137,8 +137,8 @@
 
 %changelog
 * Thu Jul 10 2008 Steve Dickson <steved at redhat.com> 1.1.1-5
-- Use the getdomainname() not the latter half of a 
-  hostname to determine the DNS domainname.
+- Stop idmapd from exiting when a valid v4 domain is 
+  not found (bz 454508)
 
 * Fri Jun 27 2008 Steve Dickson <steved at redhat.com> 1.1.1-4
 - In idmapd.conf, commented out 'Domain' so DNS will be


--- nfs-utils-lib-1.1.1-idmapd-domain-dns.patch DELETED ---