You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
37 lines
1.1 KiB
6 years ago
|
diff -up nfs-utils-1.3.0/utils/nfsd/nfsd.c.orig nfs-utils-1.3.0/utils/nfsd/nfsd.c
|
||
|
|
--- nfs-utils-1.3.0/utils/nfsd/nfsd.c.orig 2018-09-26 10:41:27.733102553 -0400
|
||
|
|
+++ nfs-utils-1.3.0/utils/nfsd/nfsd.c 2018-09-26 10:43:27.749413870 -0400
|
||
|
|
@@ -82,6 +82,9 @@ main(int argc, char **argv)
|
||
|
|
|
||
|
|
conf_init();
|
||
|
|
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);
|
||
|
|
@@ -100,13 +103,19 @@ main(int argc, char **argv)
|
||
|
|
for (i = 2; i <= 4; i++) {
|
||
|
|
char tag[10];
|
||
|
|
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.
|
||
|
|
*/
|