* amq/pawd.c (find_mt): recognize "linkx" type mounts. Patch from

Hauke Fath <hauke@Espresso.Rhein-Neckar.DE>.  Support "nfsx" while
we're at it.

diff --git a/AUTHORS b/AUTHORS
index cbc53e0842a0da9088fdfd8da1e345754f4432f1..70f75df1d3fa73b16f8db3b1146c331aba7246c4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -373,3 +373,6 @@ July 6, 2004: recognize fields in pcfs_args_t in FreeBSD 5.
 
 * Dan Nelson <dnelson@allantgroup.com>
 August 2, 2004: pawd to recognize "host" type mounts.
+
+* Hauke Fath <hauke@Espresso.Rhein-Neckar.DE>
+August 3, 2004: pawd to recognize "linkx" type mounts.

diff --git a/ChangeLog b/ChangeLog
index 8e8168626126c5041fda9d04b916cf54f2e0f99e..8ecb4b4041ff214560ad3459a155914cfdc7ed86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-03  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * amq/pawd.c (find_mt): recognize "linkx" type mounts.  Patch from
+       Hauke Fath <hauke@Espresso.Rhein-Neckar.DE>.  Support "nfsx" while
+       we're at it.
+
        * doc/am-utils.texi: mention bugzilla.  Fix broken URL HREF's.
 
 2004-08-02  Erez Zadok  <ezk@cs.sunysb.edu>

diff --git a/NEWS b/NEWS
index d1f09f6f90b66b6f5883ab3a53e316cb3db2080a..c8cee724d2eecc187ff5e21848c605a49bea0409 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,7 @@
        * fixed a race involving late replies to network queries which
          arrive after the file system has already been mounted
        * recognize pcfs_args_t fields in FreeBSD 5
-       * recognize "host" type mounts in pawd
+       * recognize other mount types in pawd: host, linkx, and nfsx
 
 *** Notes specific to am-utils version 6.1b4
 

diff --git a/amq/pawd.c b/amq/pawd.c
index 5249ce2bf0208a6210541db9e6d7923d97861460..81f0f90ca92a98f54a4b9875e04ac21c4ac69f47 100644 (file)
--- a/amq/pawd.c
+++ b/amq/pawd.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: pawd.c,v 1.13 2004/08/03 18:23:13 ezk Exp $
+ * $Id: pawd.c,v 1.14 2004/08/03 21:28:41 ezk Exp $
  *
  */
 
@@ -66,10 +66,14 @@ static int
 find_mt(amq_mount_tree *mt, char *dir)
 {
   while (mt) {
-    if (STREQ(mt->mt_type, "host") ||
+    if (
+       STREQ(mt->mt_type, "host") ||
        STREQ(mt->mt_type, "link") ||
+       STREQ(mt->mt_type, "linkx") ||
        STREQ(mt->mt_type, "nfs") ||
-       STREQ(mt->mt_type, "nfsl")) {
+       STREQ(mt->mt_type, "nfsl") ||
+       STREQ(mt->mt_type, "nfsx")
+       ) {
       int len = strlen(mt->mt_mountpoint);
       if (NSTREQ(mt->mt_mountpoint, dir, len) &&
          ((dir[len] == '\0') || (dir[len] == '/'))) {