summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2013-08-19 12:48:06 -0400
committerSteve Dickson <steved@redhat.com>2013-08-19 13:04:49 -0400
commit6b4e4965a6b82e8d49cea1c0316b951ba4e9e83e (patch)
tree698082e9f413ca67d3ba362af4512ea91bdee045
parentda05b199a60e8a8fa91d4d3734cbbe84b23cff69 (diff)
downloadnfs-utils-6b4e4965a6b82e8d49cea1c0316b951ba4e9e83e.tar.gz
nfs-utils-6b4e4965a6b82e8d49cea1c0316b951ba4e9e83e.tar.xz
nfs-utils-6b4e4965a6b82e8d49cea1c0316b951ba4e9e83e.zip
rpc.nfsd: No longer advertise NFS v2 support.
Changed the default protocol versions that rpc.nfsd register with rpcbind to just 3 and 4. Version 2 can still be enabled with the '-V' flag, but it will not be on by default. Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--support/include/nfs/nfs.h1
-rw-r--r--utils/nfsd/nfsd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h
index 174c2dd..5fd86f6 100644
--- a/support/include/nfs/nfs.h
+++ b/support/include/nfs/nfs.h
@@ -52,6 +52,7 @@ struct nfs_fh_old {
#define NFSCTL_UDPISSET(_cltbits) ((_cltbits) & NFSCTL_UDPBIT)
#define NFSCTL_TCPISSET(_cltbits) ((_cltbits) & NFSCTL_TCPBIT)
+#define NFSCTL_VERDEFAULT (0xc) /* versions 3 and 4 */
#define NFSCTL_VERSET(_cltbits, _v) ((_cltbits) |= (1 << ((_v) - 1)))
#define NFSCTL_UDPSET(_cltbits) ((_cltbits) |= NFSCTL_UDPBIT)
#define NFSCTL_TCPSET(_cltbits) ((_cltbits) |= NFSCTL_TCPBIT)
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index e87c0a9..df48392 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -100,7 +100,7 @@ main(int argc, char **argv)
char *haddr = NULL;
int socket_up = 0;
int minorvers41 = 0; /* nfsv4 minor version */
- unsigned int versbits = NFSCTL_ALLBITS;
+ unsigned int versbits = NFSCTL_VERDEFAULT;
unsigned int protobits = NFSCTL_ALLBITS;
unsigned int proto4 = 0;
unsigned int proto6 = 0;