rpms/util-linux/devel util-linux-2.13-nfsv4.patch, 1.2, 1.3 util-linux.spec, 1.102, 1.103

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27677

Modified Files:
	util-linux-2.13-nfsv4.patch util-linux.spec 
Log Message:
Updated the gssd_check() and idmapd_check(), used with
nfsv4 mounts, to looked for the correct file in /var/lock/subsys
which stops bogus warnings.


util-linux-2.13-nfsv4.patch:
 Makefile.am  |    4 
 mount.8      |   75 +++
 mount.c      |   10 
 nfs.5        |  219 +++++++++
 nfs4_mount.h |   82 +++
 nfs4mount.c  |  433 ++++++++++++++++++
 nfs_mount4.h |   22 
 nfsmount.c   | 1361 +++++++++++++++++++++++++++++++++++++++--------------------
 sundries.h   |    4 
 umount.c     |    7 
 10 files changed, 1757 insertions(+), 460 deletions(-)

Index: util-linux-2.13-nfsv4.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-nfsv4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-2.13-nfsv4.patch	17 Aug 2005 11:53:18 -0000	1.2
+++ util-linux-2.13-nfsv4.patch	20 Jan 2006 03:19:45 -0000	1.3
@@ -491,7 +491,7 @@
 +#define DEFAULT_DIR "/var/lock/subsys"
 +#endif
 +
-+char *IDMAPLCK = DEFAULT_DIR "/rpc.idmapd";
++char *IDMAPLCK = DEFAULT_DIR "/rpcidmapd";
 +#define idmapd_check() do { \
 +	if (access(IDMAPLCK, F_OK)) { \
 +		printf(_("Warning: rpc.idmapd appears not to be running.\n" \
@@ -499,7 +499,7 @@
 +	} \
 +} while(0);
 +
-+char *GSSDLCK = DEFAULT_DIR "/rpc.gssd";
++char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
 +#define gssd_check() do { \
 +		if (access(GSSDLCK, F_OK)) { \
 +			printf(_("Warning: rpc.gssd appears not to be running.\n")); \


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- util-linux.spec	3 Jan 2006 17:50:20 -0000	1.102
+++ util-linux.spec	20 Jan 2006 03:19:45 -0000	1.103
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.13
+Release: 0.14
 License: distributable
 Group: System Environment/Base
 
@@ -624,6 +624,11 @@
 /sbin/losetup
 
 %changelog
+* Thu Jan 19 2006 Steve Dickson <steved at redhat.com> 2.13-0.14
+- Updated the gssd_check() and idmapd_check(), used with
+  nfsv4 mounts, to looked for the correct file in /var/lock/subsys
+  which stops bogus warnings. 
+
 * Tue Jan  3 2006 Karel Zak <kzak at redhat.com> 2.13-0.13
 - fix #174676 - hwclock audit return code mismatch
 - fix #176441: col truncates data