Attachment 833233 Details for Bug 1038696 – proposed fix

[patch] proposed fix

0001-autofs-5.0.8-fix-vers-4-option-check-in-mount_nfs.c.patch (text/plain), 1.28 KB, created by Scott Mayhew on 2013-12-05 16:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Mayhew

Created: 2013-12-05 16:10:00 UTC

Size: 1.28 KB

patch

obsolete

>From 0818f8e86507930bfe5b875c44b15a20c485af9a Mon Sep 17 00:00:00 2001
>From: Scott Mayhew <smayhew@redhat.com>
>Date: Thu, 5 Dec 2013 10:30:16 -0500
>Subject: [PATCH] autofs-5.0.8 - fix vers=4 option check in mount_nfs.c
>
>The check for 'vers=4' that was added by commit fa7e3e2 (mount_nfs.so to
>honor explicit NFSv4 requests) isn't restrictive enough, and matches
>'-v' if it's present in the option string.  This results in a v4-only
>probe (and in the event that the server does not have v4 enabled, a
>mount failure, breaking existing maps).
>
>Signed-off-by: Scott Mayhew <smayhew@redhat.com>
>---
> modules/mount_nfs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
>index 5a582ef..3eb769a 100644
>--- a/modules/mount_nfs.c
>+++ b/modules/mount_nfs.c
>@@ -143,7 +143,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
> 			} else if (strncmp("use-weight-only", cp, o_len) == 0) {
> 				flags |= MOUNT_FLAG_USE_WEIGHT_ONLY;
> 			} else {
>-				if (strncmp("vers=4", cp, o_len) == 0 ||
>+				if ((strncmp("vers=4", cp, o_len) == 0 &&
>+				    strlen("vers=4") == o_len) ||
> 				    strncmp("nfsvers=4", cp, o_len) == 0)
> 					vers = NFS4_VERS_MASK | TCP_SUPPORTED;
> 				else if (strncmp("vers=3", cp, o_len) == 0 ||
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 1038696: 833233 | 841138 | 868391