* configure.in: check for <linux/socket.h>, which, if found,

appears to be preferable to <sys/socket.h>.  Use it to find
<linux/nfs_mount.h>.  On some Linux systems
(Gentoo), both exist but only one must be included, or else you
get redefined structure errors.

* libamu/wire.c (is_network_member): check if masknum is
INADDR_NONE, not "< 0" because it's an unsigned quantity.

* libamu/util.c (xstrlcpy): remove useless test for size_t < 0,
because it's an unsigned quantity.

diff --git a/ChangeLog b/ChangeLog
index d79c15ef916e09ee0cc3409d7101e2bbfb998dbe..c44cdf230ac7f336e21d120720e3108b04b919c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-27  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * configure.in: check for <linux/socket.h>, which, if found,
+       appears to be preferable to <sys/socket.h>.  Use it to find
+       <linux/nfs_mount.h>.  On some Linux systems
+       (Gentoo), both exist but only one must be included, or else you
+       get redefined structure errors.
+
+       * libamu/wire.c (is_network_member): check if masknum is
+       INADDR_NONE, not "< 0" because it's an unsigned quantity.
+
+       * libamu/util.c (xstrlcpy): remove useless test for size_t < 0,
+       because it's an unsigned quantity.
+
 2005-05-26  Erez Zadok  <ezk@cs.sunysb.edu>
 
        *******************************************************************

diff --git a/NEWS b/NEWS
index 8aa50d66af97508a8a01a72ebacb2ff1d0294576..15c9221422827896b0a0b68a5158597fd2860609 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+*** Notes specific to am-utils version 6.1-rc7
+
+XXX:
+
 *** Notes specific to am-utils version 6.1-rc6
 
 - minor new ports:

diff --git a/configure.in b/configure.in
index 9e4c12717bd782706ea0705750a52ef5181415f7..2cfa1419bf15d8970d8d0088f415e0c61ae8170c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS
 dnl     UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 dnl   UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 dnl UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
-AC_INIT([am-utils],[6.1-rc6],[am-utils@am-utils.org])
+AC_INIT([am-utils],[6.1-rc7],[am-utils@am-utils.org])
 dnl UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 dnl   UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 dnl     UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
@@ -59,7 +59,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.91 $)
+AC_REVISION($Revision: 1.92 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -429,6 +429,7 @@ AC_CHECK_HEADERS(                   \
        linux/nfs.h                     \
        linux/nfs2.h                    \
        linux/posix_types.h             \
+       linux/socket.h                  \
        machine/endian.h                \
        msdosfs/msdosfsmount.h          \
        net/errno.h                     \
@@ -590,9 +591,9 @@ AC_CHECK_HEADERS([                  \
        linux/nfs_mount.h               \
 ], [], [],
 [
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
+#ifdef HAVE_LINUX_SOCKET_H
+# include <linux/socket.h>
+#endif /* HAVE_LINUX_SOCKET_H */
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif /* HAVE_LIMITS_H */

diff --git a/libamu/strutil.c b/libamu/strutil.c
index a55b138fa733744634c0f91059b74c5c4172cb40..48a948777a63c9e2e9bb363a3b6f1432d1aafc9e 100644 (file)
--- a/libamu/strutil.c
+++ b/libamu/strutil.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: strutil.c,v 1.17 2005/04/29 18:48:19 ezk Exp $
+ * $Id: strutil.c,v 1.18 2005/05/27 21:26:34 ezk Exp $
  *
  */
 
@@ -93,10 +93,6 @@ str3cat(char *p, char *s1, char *s2, char *s3)
 void
 xstrlcpy(char *dst, const char *src, size_t len)
 {
-  if (len < 0) {
-    plog(XLOG_ERROR, "xstrlcpy: illegal len %lu", (u_long) len);
-    return;
-  }
   if (len == 0)
     return;
   if (strlcpy(dst, src, len) >= len)

diff --git a/libamu/wire.c b/libamu/wire.c
index 6c05a22529decc0932ea61110eec7c6fe7af87f0..312203d0dadf80a89e186719435be1db2b657db5 100644 (file)
--- a/libamu/wire.c
+++ b/libamu/wire.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: wire.c,v 1.22 2005/02/17 03:37:42 ezk Exp $
+ * $Id: wire.c,v 1.23 2005/05/27 21:26:34 ezk Exp $
  *
  */
 
@@ -326,8 +326,9 @@ is_network_member(const char *net)
     /* check if netmask uses a dotted-quad or bit-length, or not defined at all */
     if (maskstr) {
       if (strchr(maskstr, '.')) {
+       /* XXX: inet_addr is obsolste, convert to inet_aton() */
        masknum = inet_addr(maskstr);
-       if (masknum < 0)                /* can be invalid (-1) or all-1s */
+       if (masknum == INADDR_NONE) /* can be invalid (-1) or all-1s */
          masknum = 0xffffffff;
       } else if (NSTRCEQ(maskstr, "0x", 2)) {
        masknum = strtoul(maskstr, NULL, 16);