Attachment 1483344 Details for Bug 1625032 – Differentiate between printing 4.0 and 4

[patch] Differentiate between printing 4.0 and 4

nfs-utils-fixup.patch (text/plain), 1.07 KB, created by Alice Mitchell on 2018-09-14 14:28:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alice Mitchell

Created: 2018-09-14 14:28:51 UTC

Size: 1.07 KB

patch

obsolete

>Only in nfs-utils-1.3.0-59.fix/utils/nfsd: .nfsd.c.swp
>diff -ur nfs-utils-1.3.0-59/utils/nfsd/nfssvc.c nfs-utils-1.3.0-59.fix/utils/nfsd/nfssvc.c
>--- nfs-utils-1.3.0-59/utils/nfsd/nfssvc.c	2018-09-12 13:59:27.000000000 +0100
>+++ nfs-utils-1.3.0-59.fix/utils/nfsd/nfssvc.c	2018-09-14 12:54:28.000000000 +0100
>@@ -368,11 +368,11 @@
> }
> 
> static int
>-nfssvc_print_vers(char *ptr, unsigned size, unsigned vers, unsigned minorvers,
>+nfssvc_print_vers(char *ptr, unsigned size, unsigned vers, int minorvers,
> 		int isset)
> {
> 	char sign = isset ? '+' : '-';
>-	if (minorvers == 0)
>+	if (minorvers < 0)
> 		return snprintf(ptr, size, "%c%u ", sign, vers);
> 	return snprintf(ptr, size, "%c%u.%u ", sign, vers, minorvers);
> }
>@@ -389,7 +389,7 @@
> 
> 	for (n = NFSD_MINVERS; n <= ((NFSD_MAXVERS < 3) ? NFSD_MAXVERS : 3); n++)
> 		off += nfssvc_print_vers(&buf[off], sizeof(buf) - off,
>-				n, 0, NFSCTL_VERISSET(ctlbits, n));
>+				n, -1, NFSCTL_VERISSET(ctlbits, n));
> 
> 	for (n = 0; n <= NFS4_MAXMINOR; n++) {
> 		if (!NFSCTL_MINORISSET(minorversset, n))
>Only in nfs-utils-1.3.0-59.fix/utils/nfsd: .nfssvc.c.swp

Actions: View | Diff

Attachments on bug 1625032: 1483344 | 1483380 | 1485327