Correct some sanity checking in rpc.nfsd. (bz 220887)

This commit is contained in:
Steve Dickson 2007-05-10 19:14:01 +00:00
parent 22317d4406
commit c2060be9d6
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,23 @@
commit 1c84f1f980ed36e95e0bc410a7955c569bf4b4d2
Author: Steve Dickson <steved@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@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);
}

View File

@ -49,6 +49,7 @@ Patch81: nfs-utils-1.0.10-mount-fake.patch
Patch82: nfs-utils-1.0.12-mount-v4-errors.patch Patch82: nfs-utils-1.0.12-mount-v4-errors.patch
Patch83: nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch Patch83: nfs-utils-1.0.12-rmtab-ipaddr-manupdate.patch
Patch84: nfs-utils-1.0.12-mountd-memleak.patch Patch84: nfs-utils-1.0.12-mountd-memleak.patch
Patch85: nfs-utils-1.0.12-nfsd-macargs.patch
%if %{enablefscache} %if %{enablefscache}
Patch90: nfs-utils-1.0.9-mount-fsc.patch Patch90: nfs-utils-1.0.9-mount-fsc.patch
@ -123,6 +124,7 @@ This package also contains the mount.nfs and umount.nfs program.
%patch82 -p1 %patch82 -p1
%patch83 -p1 %patch83 -p1
%patch84 -p1 %patch84 -p1
%patch85 -p1
%if %{enablefscache} %if %{enablefscache}
%patch90 -p1 %patch90 -p1
%endif %endif
@ -307,13 +309,14 @@ fi
%endif %endif
%changelog %changelog
* Wed May 9 2007 Steve Dickson <steved@redhat.com> 1.0.12-18 * Wed May 10 2007 Steve Dickson <steved@redhat.com> 1.0.12-5
- Fix mount.nfs4 to display correct error message (bz 227212) - Fix mount.nfs4 to display correct error message (bz 227212)
- Updated mountd and showmount reverse lookup flags (bz 220772) - Updated mountd and showmount reverse lookup flags (bz 220772)
- Eliminate timeout on nfsd shutdowns (bz 222001) - Eliminate timeout on nfsd shutdowns (bz 222001)
- Eliminate memory leak in mountd (bz 239536) - Eliminate memory leak in mountd (bz 239536)
- Make sure statd uses correct uid/gid by chowning - Make sure statd uses correct uid/gid by chowning
the /var/lib/nfs/statd with the rpcuser id. (bz 235216) 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@redhat.com> 1.0.12-4 * Tue Apr 3 2007 Steve Dickson <steved@redhat.com> 1.0.12-4
- Replace portmap dependency with an rpcbind dependency (bz 228894) - Replace portmap dependency with an rpcbind dependency (bz 228894)