From 2498a68b1bec01d0ee8a63962b314140e8289036 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Mon, 16 Nov 2009 12:53:01 -0500 Subject: [PATCH] mount.nfs: Assume v2/v3 if mount-related options are present Don't try NFSv4 if any MNT protocol related options were presented by the user. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index b595649..a0b9e7f 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -611,6 +611,18 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi) } if (mi->version == 0) { + if (po_contains(options, "mounthost") || + po_contains(options, "mountaddr") || + po_contains(options, "mountvers") || + po_contains(options, "mountproto")) { + /* + * Since these mountd options are set assume version 3 + * is wanted so error out with EPROTONOSUPPORT so the + * protocol negation starts with v3. + */ + errno = EPROTONOSUPPORT; + goto out_fail; + } if (po_append(options, "vers=4") == PO_FAILED) { errno = EINVAL; goto out_fail; -- 2.39.5