From owner-svn-src-all@FreeBSD.ORG  Thu Oct 15 19:50:01 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 94FF01065676;
	Thu, 15 Oct 2009 19:50:01 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8403A8FC13;
	Thu, 15 Oct 2009 19:50:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FJo0f0082865;
	Thu, 15 Oct 2009 19:50:00 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FJo0ic082863;
	Thu, 15 Oct 2009 19:50:00 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200910151950.n9FJo0ic082863@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 15 Oct 2009 19:50:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198150 - stable/8/sbin/mount_nfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Oct 2009 19:50:01 -0000

Author: rmacklem
Date: Thu Oct 15 19:50:00 2009
New Revision: 198150
URL: http://svn.freebsd.org/changeset/base/198150

Log:
  MFC r197298:
  Change the default transport protocol for use by the Mount protocol
  and the NFS Null RPC done by mount_nfs from UDP to TCP, so that it is
  consistent with the kernel, which already uses NFS over TCP by
  default. Without this change, doing an NFS mount
  against a server that only supports UDP results in an unusable
  mount point if a transport protocol option wasn't specified for the
  mount.
  
  Approved by:	re (kib)

Modified:
  stable/8/sbin/mount_nfs/   (props changed)
  stable/8/sbin/mount_nfs/mount_nfs.c

Modified: stable/8/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- stable/8/sbin/mount_nfs/mount_nfs.c	Thu Oct 15 18:51:19 2009	(r198149)
+++ stable/8/sbin/mount_nfs/mount_nfs.c	Thu Oct 15 19:50:00 2009	(r198150)
@@ -104,7 +104,7 @@ struct nfhret {
 #define	OF_NOINET6	8
 int retrycnt = -1;
 int opflags = 0;
-int nfsproto = IPPROTO_UDP;
+int nfsproto = IPPROTO_TCP;
 int mnttcp_ok = 1;
 int noconn = 0;
 char *portspec = NULL;	/* Server nfs port; NULL means look up via rpcbind. */