Update lutil based on recent -devel changes.

  passwd.c in OBJS
  memcmp/strdup macro protection

diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index a1cf5ab72e8fd55748afe927d221ddef7442812a..db5d90194835083947977c5a0e18bec0219f0594 100644 (file)
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -4,7 +4,7 @@
 
 LIBRARY        = liblutil.a
 SRCS   = base64.c detach.c md5.c passwd.c sha1.c
-OBJS   = base64.o detach.o md5.o passwd.c sha1.o @LIBOBJS@
+OBJS   = base64.o detach.o md5.o passwd.o sha1.o @LIBOBJS@
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries

diff --git a/libraries/liblutil/memcmp.c b/libraries/liblutil/memcmp.c
index b2c575d955da0e4ee237cf0445c7d04eb0b34c5f..99daac2d0be7bc5fab115b70d3f10486b7c38d27 100644 (file)
--- a/libraries/liblutil/memcmp.c
+++ b/libraries/liblutil/memcmp.c
@@ -6,10 +6,10 @@
  * Memory Compare
  */
 int
-memcmp(const void *v1, const void *v2, int n) 
+(memcmp)(const void *v1, const void *v2, int n) 
 {
     if (n != 0) {
-               register const unsigned char *s1=v1, *s2=v2;
+               const unsigned char *s1=v1, *s2=v2;
         do {
             if (*s1++ != *s2++)
                 return (*--s1 - *--s2);

diff --git a/libraries/liblutil/strdup.c b/libraries/liblutil/strdup.c
index 31baa12b30e6339e2b6a0e95866b6bf2a0cc0467..27b0d81d54a402ab7ae4a088b292f8f2fdea68df 100644 (file)
--- a/libraries/liblutil/strdup.c
+++ b/libraries/liblutil/strdup.c
@@ -6,7 +6,7 @@
 #include <ac/string.h>
 #include "lutil.h"
 
-char *strdup( const char *s )
+char *(strdup)( const char *s )
 {
         char    *p;