rpms/nfs-utils/FC-4 nfs-utils-1.0.6-gssd-64bit.patch, NONE, 1.1 nfs-utils.spec, 1.57, 1.58

[fedora-cvs-commits redhat com]

Author: steved

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

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.6-gssd-64bit.patch 
Log Message:
- Changed useradd to use new -l flag (bz149407)
- 64bit fix in gssd code <bz 163139>


nfs-utils-1.0.6-gssd-64bit.patch:
 write_bytes.h |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE nfs-utils-1.0.6-gssd-64bit.patch ---
--- nfs-utils-1.0.6/utils/gssd/write_bytes.h.orig	2005-07-06 12:58:39.000000000 -0400
+++ nfs-utils-1.0.6/utils/gssd/write_bytes.h	2005-07-13 16:33:21.000000000 -0400
@@ -53,12 +53,13 @@ write_bytes(char **ptr, const char *end,
 inline static int
 write_buffer(char **p, char *end, gss_buffer_desc *arg)
 {
-	if (WRITE_BYTES(p, end, arg->length))
+	int len = (int)arg->length;             /* make an int out of size_t */
+	if (WRITE_BYTES(p, end, len))
 		return -1;
 	if (*p + arg->length > end)
 		return -1;
-	memcpy(*p, arg->value, arg->length);
-	*p += arg->length;
+	memcpy(*p, arg->value, len);
+	*p += len;
 	return 0;
 }
 
@@ -80,8 +81,11 @@ get_buffer(char **ptr, const char *end, 
 {
 	char *p, *q;
 	p = *ptr;
-	if (get_bytes(&p, end, &res->length, sizeof(res->length)))
+	int len;
+
+	if (get_bytes(&p, end, &len, sizeof(len)))
 		return -1;
+	res->length = len;              /* promote to size_t if necessary */
 	q = p + res->length;
 	if (q > end || q < p)
 		return -1;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-4/nfs-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- nfs-utils.spec	15 Jul 2005 13:01:23 -0000	1.57
+++ nfs-utils.spec	2 Aug 2005 16:08:21 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.7
-Release: 10
+Release: 11
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -42,7 +42,8 @@
 Patch61: nfs-utils-1.0.7-xlog-loginfo.patch
 Patch62: nfs-utils-1.0.7-svcgssd-bufover.patch
 Patch63: nfs-utils-1.0.7-idmap-reopen.patch
-Patch64: nfs-utils-1.0.7-nfsd-ctlbits.patch
+Patch64: nfs-utils-1.0.6-gssd-64bit.patch
+Patch65: nfs-utils-1.0.7-nfsd-ctlbits.patch
 
 Patch100: nfs-utils-1.0.7-compile.patch
 Patch150: nfs-utils-1.0.6-pie.patch
@@ -63,7 +64,8 @@
 Requires: kernel >= 2.2.14, portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
 BuildRequires: krb5-devel >= 1.3.1 autoconf >= 2.57 openldap-devel >= 2.2
-Prereq: /sbin/chkconfig /usr/sbin/useradd /sbin/nologin
+PreReq: shadow-utils >= 4.0.3-25
+Prereq: /sbin/chkconfig /sbin/nologin
 
 %description
 The nfs-utils package provides a daemon for the kernel NFS server and
@@ -99,7 +101,8 @@
 %patch61 -p1 -b .xlog
 %patch62 -p1 -b .overflow
 %patch63 -p1 -b .rename
-%patch64 -p1 -b .ctlbits
+%patch64 -p1 -b .64bit
+%patch65 -p1 -b .ctlbits
 
 
 # Do the magic to get things to compile
@@ -163,7 +166,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/useradd -c "RPC Service User" -r \
+/usr/sbin/useradd -l -c "RPC Service User" -r \
         -s /sbin/nologin -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || :
 # Define the correct unsigned uid value for 32 or 64 bit archs
 %ifarch %{all_32bit_archs}
@@ -175,7 +178,7 @@
 # If UID 65534 (or 4294967294 64bit archs) is unassigned, create user "nfsnobody"
 cat /etc/passwd | cut -d':' -f 3 | grep --quiet %{nfsnobody_uid} 2>/dev/null
 if [ "$?" -eq 1 ]; then
-	/usr/sbin/useradd -c "Anonymous NFS User" -r \
+	/usr/sbin/useradd -l -c "Anonymous NFS User" -r \
 		-s /sbin/nologin -u %{nfsnobody_uid} -d /var/lib/nfs nfsnobody 2>/dev/null || :
 fi
 
@@ -249,6 +252,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Aug  2 2005 Steve Dickson <SteveD RedHat com> 1.0.7-11
+- Changed useradd to use new -l flag (bz149407)
+- 64bit fix in gssd code <bz 163139>
+
 * Fri Jul 15 2005 Steve Dickson <SteveD RedHat com> 1.0.7-9
 - Add ctlbits patch that introduced the -N -T and -U
   command line flags to rpc.nfsd.