Add support for useronly configuration attributes.

[openldap] / libraries / libldap / util-int.c

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 2316716da670f11878e4b87567d1146ed481f78e..a3128e6e17b14c284e5f0c5de311ff788afa1495 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -22,7 +23,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>
@@ -42,6 +43,17 @@
 #      define USE_CTIME_R
 #endif
 
+#if defined(HAVE_GETHOSTBYNAME_R) && \
+    (GETHOSTBYNAME_R_NARGS > 6 || GETHOSTBYNAME_R_NARGS < 5)
+       /* Don't know how to handle this version, pretend it's not there */
+#      undef HAVE_GETHOSTBYNAME_R
+#endif
+#if defined(HAVE_GETHOSTBYADDR_R) && \
+    (GETHOSTBYADDR_R_NARGS > 8 || GETHOSTBYADDR_R_NARGS < 7)
+       /* Don't know how to handle this version, pretend it's not there */
+#      undef HAVE_GETHOSTBYADDR_R
+#endif
+
 #ifdef LDAP_R_COMPILE
 # ifndef USE_CTIME_R
        static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
@@ -58,7 +70,9 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf )
 {
 #ifdef USE_CTIME_R
 # if (CTIME_R_NARGS > 3) || (CTIME_R_NARGS < 2)
-       choke me!  nargs should have 2 or 3
+#      error "CTIME_R_NARGS should be 2 or 3"
+# elif CTIME_R_NARGS > 2 && defined(CTIME_R_RETURNS_INT)
+       return( ctime_r(tp,buf,26) < 0 ? 0 : buf );
 # elif CTIME_R_NARGS > 2
        return ctime_r(tp,buf,26);
 # else
@@ -92,10 +106,6 @@ int ldap_pvt_gethostbyname_a(
 {
 #if defined( HAVE_GETHOSTBYNAME_R )
 
-# if (GETHOSTBYNAME_R_NARGS > 6) || (GETHOSTBYNAME_R_NARGS < 5)
-    Ouch! gethostbyname_r() must have either 5 or 6 args
-#endif
-
 # define NEED_SAFE_REALLOC 1   
        int r=-1;
        int buflen=BUFSTART;
@@ -105,15 +115,15 @@ int ldap_pvt_gethostbyname_a(
                        return r;
 
 #if (GETHOSTBYNAME_R_NARGS < 6)
-               r = ((*result=gethostbyname_r( name, resbuf, *buf,\
-                                              buflen, herrno_ptr ))== NULL) ?\
+               r = ((*result=gethostbyname_r( name, resbuf, *buf,
+                                              buflen, herrno_ptr ))== NULL) ?
                    -1 : 0;
 #else
                r = gethostbyname_r( name, resbuf, *buf,
                        buflen, result, herrno_ptr );
 #endif
 
-               Debug( LDAP_DEBUG_TRACE, "ldap_pvt_gethostbyname_a: host=%s, r=%d\n",\
+               Debug( LDAP_DEBUG_TRACE, "ldap_pvt_gethostbyname_a: host=%s, r=%d\n",
                       name, r, 0 );
 
 #ifdef NETDB_INTERNAL
@@ -175,10 +185,6 @@ int ldap_pvt_gethostbyaddr_a(
 {
 #if defined( HAVE_GETHOSTBYADDR_R )
 
-#if (GETHOSTBYADDR_R_NARGS > 8) || (GETHOSTBYADDR_R_NARGS < 7)
-    Ouch! gethostbyaddr_r() must have either 7 or 8 args
-#endif
-
 # undef NEED_SAFE_REALLOC
 # define NEED_SAFE_REALLOC   
        int r=-1;
@@ -190,7 +196,7 @@ int ldap_pvt_gethostbyaddr_a(
 #if (GETHOSTBYADDR_R_NARGS < 8)
                r = ((*result=gethostbyaddr_r( addr, len, type,
                                               resbuf, *buf, buflen, 
-                                              herrno_ptr )) == NULL) ?\
+                                              herrno_ptr )) == NULL) ?
                    -1 : 0;
 #else
                r = gethostbyaddr_r( addr, len, type,
@@ -244,10 +250,10 @@ int ldap_pvt_gethostbyaddr_a(
 #endif 
 }
 /* 
- * ldap_pvt_init_utils() should be called before any other function.
+ * ldap_int_utils_init() should be called before any other function.
  */
 
-void ldap_pvt_init_utils( void )
+void ldap_int_utils_init( void )
 {
        static int done=0;
        if (done)
@@ -355,7 +361,7 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
 static char *safe_realloc( char **buf, int len )
 {
        char *tmpbuf;
-       tmpbuf = realloc( *buf, len );
+       tmpbuf = LDAP_REALLOC( *buf, len );
        if (tmpbuf) {
                *buf=tmpbuf;
        }