From dc23e1aeea0544247a513a6cdd319033b52fe287 Mon Sep 17 00:00:00 2001
From: peter <peter@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 21 Aug 2014 04:31:48 +0000
Subject: [PATCH] MFC r270062: switch rpc mount protocol for showmount and
 umount from mountv1 to mountv3 - it breaks by default on the new netapp
 release with the legacy protocols removed.

git-svn-id: svn://svn.freebsd.org/base/stable/10@270258 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/umount/umount.c          | 2 +-
 usr.bin/showmount/showmount.8 | 9 +++++----
 usr.bin/showmount/showmount.c | 7 +++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index f2e02f26d..521bbc890 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -394,7 +394,7 @@ umountfs(struct statfs *sfs)
 	 * has been unmounted.
 	 */
 	if (ai != NULL && !(fflag & MNT_FORCE) && do_rpc) {
-		clp = clnt_create(hostp, MOUNTPROG, MOUNTVERS, "udp");
+		clp = clnt_create(hostp, MOUNTPROG, MOUNTVERS3, "udp");
 		if (clp  == NULL) {
 			warnx("%s: %s", hostp,
 			    clnt_spcreateerror("MOUNTPROG"));
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index f49df8437..106b1a18c 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -31,7 +31,7 @@
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd March 29, 1995
+.Dd August 16, 2014
 .Dt SHOWMOUNT 8
 .Os
 .Sh NAME
@@ -41,6 +41,7 @@
 .Nm
 .Op Fl a | d
 .Op Fl e
+.Op Fl 1
 .Op Fl 3
 .Op Ar host
 .Sh DESCRIPTION
@@ -76,10 +77,10 @@ List directory paths of mount points instead of hosts.
 Show the
 .Ar host Ns 's
 exports list.
+.It Fl 1
+Use mount protocol Version 1, compatible with legacy servers.
 .It Fl 3
-Use mount protocol Version 3, compatible with
-.Tn NFS
-Version 3.
+Ignored for backwards compatibility.
 .El
 .Sh SEE ALSO
 .Xr mount 8 ,
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 263525066..d0da57050 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -110,11 +110,11 @@ main(int argc, char **argv)
 {
 	register struct exportslist *exp;
 	register struct grouplist *grp;
-	register int rpcs = 0, mntvers = 1;
+	register int rpcs = 0, mntvers = 3;
 	const char *host;
 	int ch, estat;
 
-	while ((ch = getopt(argc, argv, "ade3")) != -1)
+	while ((ch = getopt(argc, argv, "ade13")) != -1)
 		switch (ch) {
 		case 'a':
 			if (type == 0) {
@@ -133,6 +133,9 @@ main(int argc, char **argv)
 		case 'e':
 			rpcs |= DOEXPORTS;
 			break;
+		case '1':
+			mntvers = 1;
+			break;
 		case '3':
 			mntvers = 3;
 			break;
-- 
2.45.0