50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 98a07fa29244369dec8b03bac7b1a64a0b3aa7fc Mon Sep 17 00:00:00 2001
|
|
From: huyan <hu.huyan@huawei.com>
|
|
Date: Fri, 15 Mar 2019 17:03:10 +0800
|
|
Subject: [PATCH] backport bugfix fail disable major NFS version 4
|
|
|
|
---
|
|
nfs-utils-2.3.3/utils/nfsd/nfsd.c | 15 ++++++++++++---
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git nfs-utils-2.3.3/utils/nfsd/nfsd.c nfs-utils-2.3.3/utils/nfsd/nfsd.c
|
|
index 6b57e2b..b256bd9 100644
|
|
--- nfs-utils-2.3.3/utils/nfsd/nfsd.c
|
|
+++ nfs-utils-2.3.3/utils/nfsd/nfsd.c
|
|
@@ -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.
|
|
*/
|
|
--
|
|
1.8.3.1
|
|
|