[src/trunk]: src/usr.sbin/amd/amd Integrate fix from bin/7378: call the extra...

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

details:   https://anonhg.NetBSD.org/src/rev/7ffcf4acb19f
branches:  trunk
changeset: 471880:7ffcf4acb19f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Apr 14 09:07:01 1999 +0000

description:
Integrate fix from bin/7378: call the extra get_nfs_version() after
we make sure nfs_proto is initialised, and only if we have a valid ip.

diffstat:

 usr.sbin/amd/amd/srvr_nfs.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 92a39b55bafd -r 7ffcf4acb19f usr.sbin/amd/amd/srvr_nfs.c
--- a/usr.sbin/amd/amd/srvr_nfs.c       Wed Apr 14 09:03:41 1999 +0000
+++ b/usr.sbin/amd/amd/srvr_nfs.c       Wed Apr 14 09:07:01 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srvr_nfs.c,v 1.12 1999/04/07 11:21:49 bouyer Exp $     */
+/*     $NetBSD: srvr_nfs.c,v 1.13 1999/04/14 09:07:01 bouyer Exp $     */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -755,15 +755,17 @@
 #endif /* not HAVE_FS_NFS3 */
   }
 
-  /*    
-   * 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);  
-
   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);