rpms/nfs-utils/devel nfs-utils-1.0.8-rc2-nfs4_setdebug.patch, NONE, 1.1 nfs-utils.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19049

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.8-rc2-nfs4_setdebug.patch 
Log Message:
Added new libnfsidmap call, nfs4_set_debug(), to rpc.idmapd
which turns on debugging in the libarary.


nfs-utils-1.0.8-rc2-nfs4_setdebug.patch:
 idmapd.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.0.8-rc2-nfs4_setdebug.patch ---
--- nfs-utils-1.0.8-rc2/utils/idmapd/idmapd.c.orig	2005-12-16 00:24:46.000000000 -0500
+++ nfs-utils-1.0.8-rc2/utils/idmapd/idmapd.c	2006-01-20 09:10:58.515833000 -0500
@@ -287,6 +287,7 @@ main(int argc, char **argv)
 
 	if (stat(conf_path, &sb) == -1 && (errno == ENOENT || errno == EACCES)) {
 		warn("Skipping configuration file \"%s\"", conf_path);
+		conf_path = NULL;
 	} else {
 		conf_init();
 		verbose = conf_get_num("General", "Verbosity", 0);
@@ -295,7 +296,6 @@ main(int argc, char **argv)
 			strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir));
 		CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User"));
 		CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group"));
-		nfs4_init_name_mapping(conf_path);
 	}
 
 	while ((opt = getopt(argc, argv, GETOPTSTR)) != -1)
@@ -337,6 +337,12 @@ main(int argc, char **argv)
 		errx(1, "Could not find group \"%s\"", nobodygroup);
 	nobodygid = gr->gr_gid;
 
+	nfs4_set_debug(verbose, idmapd_warnx);
+	if (conf_path == NULL) 
+		conf_path = _PATH_IDMAPDCONF;
+	if (nfs4_init_name_mapping(conf_path))
+		errx(1, "Unable to create name to user id mappings.");
+
 	if (!fg)
 		mydaemon(0, 0);
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- nfs-utils.spec	16 Jan 2006 13:53:39 -0000	1.82
+++ nfs-utils.spec	20 Jan 2006 14:37:19 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc2
-Release: 3.FC5
+Release: 4.FC5
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -23,6 +23,7 @@
 Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch
 Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch
 Patch57: nfs-utils-1.0.8-rc2-innetgr.patch
+Patch58: nfs-utils-1.0.8-rc2-nfs4_setdebug.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -43,10 +44,11 @@
 Requires: modutils >= 2.4.26-9
 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
-BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel
+BuildRequires: nfs-utils-lib-devel >= 1.0.8-2
+BuildRequires: libevent-devel libgssapi-devel
 PreReq: shadow-utils >= 4.0.3-25
 PreReq: /sbin/chkconfig /sbin/nologin
-PreReq: nfs-utils-lib libevent libgssapi
+PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi
 
 %description
 The nfs-utils package provides a daemon for the kernel NFS server and
@@ -68,6 +70,7 @@
 %patch55 -p1 -b .ctlbits
 %patch56 -p1 -b .makeam
 %patch57 -p1 -b .innetgr
+%patch58 -p1 -b .setdebug
 
 # Do the magic to get things to compile
 %patch100 -p1 -b .compile
@@ -220,6 +223,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Fri Jan 20 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8.rc2-4.FC5
+- Added new libnfsidmap call, nfs4_set_debug(), to rpc.idmapd
+  which turns on debugging in the libarary.
+
 * Mon Jan 16 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8.rc2-3.FC5
 - Added innetgr patch that changes configure scripts to 
   check for the innetgr function. (bz 177899)