From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Tue, 30 Sep 2003 01:22:11 +0000 (+0000)
Subject: * minor new port mipsel-unknown-linux-rhPS2 (Linux on Sony
X-Git-Tag: before-retrans-udp-tcp-split~87
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=a3e17c501bd32c788c2f29989e6d2a15e502cbb2;p=am-utils-6.2.git

* minor new port mipsel-unknown-linux-rhPS2 (Linux on Sony
PlayStation 2)

* amd/srvr_nfs.c (find_nfs_srvr): don't run code that expects
"char protocols[]" unless MNTTAB_OPT_PROTO is defined.
---

diff --git a/.cvsignore b/.cvsignore
index 53fda635..8ba1c5e8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -115,3 +115,4 @@ A.i386-unknown-freebsd5.1
 A.i686-apple-darwin6.6
 A.i386-unknown-freebsd4.8
 A.x86_64-unknown-linux-rh2.9.5AS
+A.mipsel-unknown-linux-rhPS2
diff --git a/ChangeLog b/ChangeLog
index ea40f301..7d25981a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-29  Erez Zadok  <ezk@urd.fsl.cs.sunysb.edu>
+
+	* minor new port mipsel-unknown-linux-rhPS2 (Linux on Sony
+	PlayStation 2)
+
+	* amd/srvr_nfs.c (find_nfs_srvr): don't run code that expects
+	"char protocols[]" unless MNTTAB_OPT_PROTO is defined.
+
 2003-09-26  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	Consolidate alloca support.
diff --git a/NEWS b/NEWS
index 0788c212..b6470994 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
 *** Notes specific to am-utils version 6.1b5pre
 
 - minor new ports:
-        i386-unknown-freebsd4.8
+	i386-unknown-freebsd4.8
+	mipsel-unknown-linux-rhPS2 (Linux on Sony PlayStation 2)
 
 *** Notes specific to am-utils version 6.1b4
 
diff --git a/amd/srvr_nfs.c b/amd/srvr_nfs.c
index 025a428a..3db2f54d 100644
--- a/amd/srvr_nfs.c
+++ b/amd/srvr_nfs.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: srvr_nfs.c,v 1.30 2003/09/16 04:14:37 ib42 Exp $
+ * $Id: srvr_nfs.c,v 1.31 2003/09/30 01:22:12 ezk Exp $
  *
  */
 
@@ -765,6 +765,7 @@ find_nfs_srvr(mntfs *mf)
       if (nfs_proto) {
 	best_nfs_version = get_nfs_version(host, ip, nfs_version, nfs_proto);
 	nfs_port = ip->sin_port;
+#ifdef MNTTAB_OPT_PROTO
       } else {
 	int proto_nfs_version;
 	char **p;
@@ -778,7 +779,8 @@ find_nfs_srvr(mntfs *mf)
 	    nfs_port = ip->sin_port;
 	  }
 	}
-      }
+#endif /* MNTTAB_OPT_PROTO */
+      } /* end of "if (nfs_proto)" */
     } else {
       plog(XLOG_INFO, "portmapper service not running on %s", host);
     }