Attachment 1485327 Details for Bug 1625032 – Patch the bug in the same style as upstream

[patch] Patch the bug in the same style as upstream

nfs-utils-fixup.patch (text/plain), 1.36 KB, created by Alice Mitchell on 2018-09-20 21:56:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alice Mitchell

Created: 2018-09-20 21:56:49 UTC

Size: 1.36 KB

patch

obsolete

>diff -ur nfs-utils-1.3.0-59.orig/utils/nfsd/nfsd.c nfs-utils-1.3.0-59.bug/utils/nfsd/nfsd.c
>--- nfs-utils-1.3.0-59.orig/utils/nfsd/nfsd.c	2018-09-12 08:59:27.000000000 -0400
>+++ nfs-utils-1.3.0-59.bug/utils/nfsd/nfsd.c	2018-09-20 17:51:49.000000000 -0400
>@@ -81,6 +81,9 @@
> 
> 	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);
>@@ -99,20 +102,22 @@
> 	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.
> 	 */
>-	if (NFSCTL_VERISSET(versbits, 4)) {
>-		NFSCTL_MINORSET(minorversset, 0);
>-		NFSCTL_MINORSET(minorvers, 0);
>-	}
> 	for (i = 1; i <= NFS4_MAXMINOR; i++) {
> 		char tag[20];
> 		sprintf(tag, "vers4.%d", i);
>Only in nfs-utils-1.3.0-59.bug/utils/nfsd: .nfsd.c.swp

Actions: View | Diff

Attachments on bug 1625032: 1483344 | 1483380 | 1485327