[src/trunk]: src/dist/am-utils/amd Now that the problem with TCP mounts is fi...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3f9b31a30cb
branches:  trunk
changeset: 500463:b3f9b31a30cb
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Dec 12 17:06:34 2000 +0000

description:
Now that the problem with TCP mounts is fixed, switch back to TCP mounts
by default. This allows to kill the hack that was added to work around
a problem with SunOS 4.x NFS servers.

diffstat:

 dist/am-utils/amd/srvr_nfs.c |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (33 lines):

diff -r b46986a71f90 -r b3f9b31a30cb dist/am-utils/amd/srvr_nfs.c
--- a/dist/am-utils/amd/srvr_nfs.c      Tue Dec 12 16:47:05 2000 +0000
+++ b/dist/am-utils/amd/srvr_nfs.c      Tue Dec 12 17:06:34 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srvr_nfs.c,v 1.3 2000/11/20 00:02:56 wiz Exp $ */
+/*     $NetBSD: srvr_nfs.c,v 1.4 2000/12/12 17:06:34 bouyer Exp $      */
 
 /*
  * Copyright (c) 1997-2000 Erez Zadok
@@ -96,7 +96,7 @@
 
 #if defined(MNTTAB_OPT_PROTO) || defined(HAVE_FS_NFS3)
 /* protocols we know about, in order of preference */
-static char *protocols[] = { "udp", "tcp", NULL };
+static char *protocols[] = { "tcp", "udp", NULL };
 #endif /* defined(MNTTAB_OPT_PROTO) || defined(HAVE_FS_NFS3) */
 
 /* forward definitions */
@@ -768,14 +768,6 @@
   if (!nfs_proto)
     nfs_proto = "udp";
 
-  if (ip) {
-    /*    
-     * XXX RPC or SunOS 4.1.4 bug ? the last call to nfs_get_version() must  
-     * be done with the used version and proto  
-     */  
-    (void)get_nfs_version(host, ip, nfs_version, nfs_proto);  
-  }
-
   plog(XLOG_INFO, "Using NFS version %d, protocol %s on host %s",
        (int) nfs_version, nfs_proto, host);