* 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 53fda6355305137fdddd7eb7555e53a044812149..8ba1c5e809b3162c688c6a75b5924141cb8d2126 100644 (file)
--- 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 ea40f3013c608f4bf111c384a69b5e1658f2749e..7d25981ac29e1536befa7805be93f369cb7b4b8b 100644 (file)
--- 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 0788c212a4f3d6e81e1262cf54d69c2af10f8b73..b6470994a6f3e79cacb465d5fbf8d3d73bb8ffa9 100644 (file)
--- 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 025a428aebabe90a61b0de4112c9ff5a135b93e5..3db2f54dc3a98ba33f6d6af99b6053439d1d2ab6 100644 (file)
--- 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);
     }