X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Futil-int.c;h=c5d17fc4dd825610d39bec7db7f7b2cb42e61606;hb=64d5725662d33a168055df6db2ea06c366a1d0f1;hp=1308eb621d5507d2e711c18e3c2d9c0d869d6986;hpb=5b83a959d275cccd825977b4e9c3a90cf1784616;p=openldap

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 1308eb621d..c5d17fc4dd 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -22,7 +22,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>
@@ -69,7 +69,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
@@ -112,15 +114,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
@@ -193,7 +195,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,
@@ -247,10 +249,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)
@@ -358,7 +360,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;
 	}