rpms/nfs-utils/devel nfs-utils-1.0.12-nfsd-macargs.patch, NONE, 1.1 nfs-utils.spec, 1.132, 1.133

Steve Dickson (steved) fedora-extras-commits at redhat.com
Thu May 10 19:17:41 UTC 2007


Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11492

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.12-nfsd-macargs.patch 
Log Message:
Correct some sanity checking in rpc.nfsd. (bz 220887)


nfs-utils-1.0.12-nfsd-macargs.patch:

--- NEW FILE nfs-utils-1.0.12-nfsd-macargs.patch ---
commit 1c84f1f980ed36e95e0bc410a7955c569bf4b4d2
Author: Steve Dickson <steved at redhat.com>
Date:   Thu May 10 15:04:07 2007 -0400

    The wrong bit field is being passed to NFSCTL_TCPISSET()
    during one of the sanity checks in rpc.nfsd.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index d0bbfb3..aaf8d29 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -118,7 +118,8 @@ main(int argc, char **argv)
 		fprintf(stderr, "no version specified\n");
 		exit(1);
 	}			
-	if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(versbits)) {
+
+	if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(protobits)) {
 		fprintf(stderr, "version 4 requires the TCP protocol\n");
 		exit(1);
 	}


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- nfs-utils.spec	10 May 2007 18:53:25 -0000	1.132
+++ nfs-utils.spec	10 May 2007 19:14:01 -0000	1.133
@@ -49,6 +49,7 @@
 Patch82: nfs-utils-1.0.12-mount-v4-errors.patch
 Patch83: nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch
 Patch84: nfs-utils-1.0.12-mountd-memleak.patch
+Patch85: nfs-utils-1.0.12-nfsd-macargs.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.0.9-mount-fsc.patch
@@ -123,6 +124,7 @@
 %patch82 -p1
 %patch83 -p1
 %patch84 -p1
+%patch85 -p1
 %if %{enablefscache}
 %patch90 -p1
 %endif
@@ -307,13 +309,14 @@
 %endif
 
 %changelog
-* Wed May  9 2007 Steve Dickson <steved at redhat.com> 1.0.12-18
+* Wed May 10 2007 Steve Dickson <steved at redhat.com> 1.0.12-5
 - Fix mount.nfs4 to display correct error message (bz 227212)
 - Updated mountd and showmount reverse lookup flags (bz 220772)
 - Eliminate timeout on nfsd shutdowns (bz 222001)
 - Eliminate memory leak in mountd (bz 239536)
 - Make sure statd uses correct uid/gid by chowning
   the /var/lib/nfs/statd with the rpcuser id. (bz 235216)
+- Correct some sanity checking in rpc.nfsd. (bz 220887) 
 
 * Tue Apr  3 2007 Steve Dickson <steved at redhat.com> 1.0.12-4
 - Replace portmap dependency with an rpcbind dependency (bz 228894)




More information about the fedora-extras-commits mailing list