svn commit: r270258 - in stable/10: sbin/umount usr.bin/showmount

[Peter Wemm]

Author: peter
Date: Thu Aug 21 04:31:48 2014
New Revision: 270258
URL: http://svnweb.freebsd.org/changeset/base/270258

Log:
  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.

Modified:
  stable/10/sbin/umount/umount.c
  stable/10/usr.bin/showmount/showmount.8
  stable/10/usr.bin/showmount/showmount.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/umount/umount.c
==============================================================================
--- stable/10/sbin/umount/umount.c	Thu Aug 21 04:26:16 2014	(r270257)
+++ stable/10/sbin/umount/umount.c	Thu Aug 21 04:31:48 2014	(r270258)
@@ -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"));

Modified: stable/10/usr.bin/showmount/showmount.8
==============================================================================
--- stable/10/usr.bin/showmount/showmount.8	Thu Aug 21 04:26:16 2014	(r270257)
+++ stable/10/usr.bin/showmount/showmount.8	Thu Aug 21 04:31:48 2014	(r270258)
@@ -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 ins
 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 ,

Modified: stable/10/usr.bin/showmount/showmount.c
==============================================================================
--- stable/10/usr.bin/showmount/showmount.c	Thu Aug 21 04:26:16 2014	(r270257)
+++ stable/10/usr.bin/showmount/showmount.c	Thu Aug 21 04:31:48 2014	(r270258)
@@ -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;