|
 |
5fd2c0 |
diff -up nfs-utils-1.3.0/utils/nfsd/nfsd.c.orig nfs-utils-1.3.0/utils/nfsd/nfsd.c
|
|
|
5fd2c0 |
--- nfs-utils-1.3.0/utils/nfsd/nfsd.c.orig 2018-09-26 10:41:27.733102553 -0400
|
|
|
5fd2c0 |
+++ nfs-utils-1.3.0/utils/nfsd/nfsd.c 2018-09-26 10:43:27.749413870 -0400
|
|
|
5fd2c0 |
@@ -82,6 +82,9 @@ main(int argc, char **argv)
|
|
|
5fd2c0 |
|
|
|
5fd2c0 |
conf_init();
|
|
|
5fd2c0 |
xlog_from_conffile("nfsd");
|
|
|
5fd2c0 |
+
|
|
|
5fd2c0 |
+ nfssvc_get_minormask(&minormask);
|
|
|
5fd2c0 |
+
|
|
|
5fd2c0 |
count = conf_get_num("nfsd", "threads", count);
|
|
|
5fd2c0 |
grace = conf_get_num("nfsd", "grace-time", grace);
|
|
|
5fd2c0 |
lease = conf_get_num("nfsd", "lease-time", lease);
|
|
|
5fd2c0 |
@@ -100,13 +103,19 @@ main(int argc, char **argv)
|
|
|
5fd2c0 |
for (i = 2; i <= 4; i++) {
|
|
|
5fd2c0 |
char tag[10];
|
|
|
5fd2c0 |
sprintf(tag, "vers%d", i);
|
|
|
5fd2c0 |
- if (conf_get_bool("nfsd", tag, NFSCTL_VERISSET(versbits, i)))
|
|
|
5fd2c0 |
+ if (conf_get_bool("nfsd", tag, NFSCTL_VERISSET(versbits, i))) {
|
|
|
5fd2c0 |
NFSCTL_VERSET(versbits, i);
|
|
|
5fd2c0 |
- else
|
|
|
5fd2c0 |
+ if (i == 4)
|
|
|
5fd2c0 |
+ minorvers = minorversset = minormask;
|
|
|
5fd2c0 |
+ } else {
|
|
|
5fd2c0 |
NFSCTL_VERUNSET(versbits, i);
|
|
|
5fd2c0 |
+ if (i == 4) {
|
|
|
5fd2c0 |
+ minorvers = 0;
|
|
|
5fd2c0 |
+ minorversset = minormask;
|
|
|
5fd2c0 |
+ }
|
|
|
5fd2c0 |
+ }
|
|
|
5fd2c0 |
}
|
|
|
5fd2c0 |
|
|
|
5fd2c0 |
- nfssvc_get_minormask(&minormask);
|
|
|
5fd2c0 |
/* We assume the kernel will default all minor versions to 'on',
|
|
|
5fd2c0 |
* and allow the config file to disable some.
|
|
|
5fd2c0 |
*/
|