Author: peter
Date: Sat Aug 16 14:56:11 2014
New Revision: 270062
URL: http://svnweb.freebsd.org/changeset/base/270062
Log:
Use mount protocol version 3 by default for showmount and umount.
mount_nfs effectively uses mount protocol v3 by default already.
v1 mount protocol is being removed along with nfsv2 by a high profile NFS
appliance vendor and our legacy v1 mount protocol usage causes rpc errors.
Modified:
head/sbin/umount/umount.c
head/usr.bin/showmount/showmount.8
head/usr.bin/showmount/showmount.c
Modified: head/sbin/umount/umount.c
==============================================================================
--- head/sbin/umount/umount.c Sat Aug 16 14:30:46 2014 (r270061)
+++ head/sbin/umount/umount.c Sat Aug 16 14:56:11 2014 (r270062)
@@ -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: head/usr.bin/showmount/showmount.8
==============================================================================
--- head/usr.bin/showmount/showmount.8 Sat Aug 16 14:30:46 2014
(r270061)
+++ head/usr.bin/showmount/showmount.8 Sat Aug 16 14:56:11 2014
(r270062)
@@ -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: head/usr.bin/showmount/showmount.c
==============================================================================
--- head/usr.bin/showmount/showmount.c Sat Aug 16 14:30:46 2014
(r270061)
+++ head/usr.bin/showmount/showmount.c Sat Aug 16 14:56:11 2014
(r270062)
@@ -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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
