nfs.conf: fail to disable major NFS version 4 using "vers4=n" in /etc/nfs.conf
Subsystems (2)
PATCH 1/1 nfs.conf: fail to disable major NFS version 4 using "vers4=n" in /etc/nfs.conf
From: Justin Mitchell <[email protected]>
Setting "vers4=n/off" (disabling the major NFS version 4) in nfs.conf doesn't work now.
Refer to rpc.nfsd(8), "vers3/vers4" in the [nfsd] section of the /etc/nfs.conf file is to enable or disable a major NFS version 3 or 4 (which are normally enabled by default).
Signed-off-by Steve Dickson <[email protected]>
--- utils/nfsd/nfsd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
utils/nfsd/nfsd.c +12 -3
@@ -83,6 +83,9 @@ main(int argc, char **argv)conf_init_file (NFS_CONFFILE );xlog_from_conffile ("nfsd" ); + +nfssvc_get_minormask (&minormask); + count =conf_get_num ("nfsd" ,"threads" , count); grace =conf_get_num ("nfsd" ,"grace-time" , grace); lease =conf_get_num ("nfsd" ,"lease-time" , lease);
@@ -101,13 +104,19 @@ main(int argc, char **argv)for (i =2 ; i <=4 ; i++) {char tag[20 ];sprintf (tag,"vers%d" , i); -if (conf_get_bool ("nfsd" , tag,NFSCTL_VERISSET (versbits, i))) +if (conf_get_bool ("nfsd" , tag,NFSCTL_VERISSET (versbits, i))) {NFSCTL_VERSET (versbits, i); -else +if (i ==4 ) + minorvers = minorversset = minormask; + }else {NFSCTL_VERUNSET (versbits, i); +if (i ==4 ) { + minorvers =0 ; + minorversset = minormask; + } + } } -nfssvc_get_minormask (&minormask);/* We assume the kernel will default all minor versions to 'on', * and allow the config file to disable some. */
Signature · 1 line
2.17.1