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

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index e2b36c5f12..c5d17fc4dd 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -4,8 +4,8 @@
  */
 /*
  * util-int.c	Various functions to replace missing threadsafe ones.
- *				  Without the real *_r funcs, things will work, but won't be
- *				  threadsafe. 
+ *				  Without the real *_r funcs, things will
+ *				  work, but might not be threadsafe. 
  * 
  * Written by Bart Hartgers.
  *
@@ -19,9 +19,10 @@
  * in file LICENSE in the top-level directory of the distribution.
  */ 
 
+
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/errno.h>
 #include <ac/socket.h>
@@ -32,115 +33,59 @@
 
 #if defined( LDAP_R_COMPILE )
 # include <ldap_pvt_thread.h>
-# if !defined( HAVE_REENTRANT_FUNCTIONS )
-#  if !defined( HAVE_CTIME_R )
-#   define LDAP_INT_CTIME_MUTEX 1
-#  endif
-#  if !defined( HAVE_GETHOSTBYNAME_R )
-#   define LDAP_INT_GETHOSTBYNAME_MUTEX 1
-#  endif
-#  if !defined( HAVE_GETHOSTBYADDR_R )
-#   define LDAP_INT_GETHOSTBYADDR_MUTEX 1
-#  endif
-# endif /* defined( HAVE_REENTRANT_FUNCTIONS ) */
-
-#if defined( LDAP_INT_CTIME_MUTEX )
-static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
-#endif
-#if defined( LDAP_INT_GETHOSTBYNAME_MUTEX )
-static ldap_pvt_thread_mutex_t ldap_int_gethostbyname_mutex;
-#endif
-#if defined( LDAP_INT_GETHOSTBYADDR_MUTEX )
-static ldap_pvt_thread_mutex_t ldap_int_gethostbyaddr_mutex;
-#endif
-#else /* LDAP_R_COMPILE */
-#undef HAVE_REENTRANT_FUNCTIONS
-#endif
-
-#if defined ( HAVE_STRSPN )
-#define int_strspn strspn
 #else
-static int int_strspn( const char *str, const char *delim )
-{
-	int pos;
-	const char *p=delim;
-	for( pos=0; (*str) ; pos++,str++) {
-		if (*str!=*p)
-			for( p=delim; (*p) ; p++ ) {
-				if (*str==*p)
-					break;
-		  	}
-		if (*p=='\0')
-			return pos;
-	}
-	return pos;
-}
+# undef HAVE_REENTRANT_FUNCTIONS
 #endif
 
-#if defined( HAVE_STRPBRK )
-#define int_strpbrk strpbrk
-#else
-static char *int_strpbrk( const char *str, const char *accept )
-{
-	const char *p;
-	for( ; (*str) ; str++ ) {
-		for( p=accept; (*p) ; p++) {
-			if (*str==*p)
-				return str;
-		}
-	}
-	return NULL;
-}
+#if (defined( HAVE_CTIME_R ) || defined( HAVE_REENTRANT_FUNCTIONS)) \
+	&& defined( CTIME_R_NARGS )
+#	define USE_CTIME_R
 #endif
 
-char *ldap_pvt_strtok( char *str, const char *delim, char **pos )
-{
-#if defined( HAVE_STRTOK_R ) || defined( HAVE_REENTRANT_FUNCTIONS )
-	return strtok_r(str, delim, pos);
-#else
-	char *p;
-
-	if (pos==NULL)
-		return NULL;
-	if (str==NULL) {
-		if (*pos==NULL)
-			return NULL;
-		str=*pos;
-	}
-	/* skip any initial delimiters */
-	str += int_strspn( str, delim );
-	if (*str == '\0')
-		return NULL;
-	p = int_strpbrk( str, delim );
-	if (p==NULL) {
-		*pos = NULL;
-	} else {
-		*p ='\0';
-		*pos = p+1;
-	}
-	return str;
+#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;
+# endif
+# ifndef HAVE_GETHOSTBYNAME_R
+	static ldap_pvt_thread_mutex_t ldap_int_gethostbyname_mutex;
+# endif
+# ifndef HAVE_GETHOSTBYADDR_R
+	static ldap_pvt_thread_mutex_t ldap_int_gethostbyaddr_mutex;
+# endif
+#endif /* LDAP_R_COMPILE */
 
 char *ldap_pvt_ctime( const time_t *tp, char *buf )
 {
-#if (defined( HAVE_CTIME_R ) || defined( HAVE_REENTRANT_FUNCTIONS)) \
-	&& defined( CTIME_R_NARGS )
+#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
 	return ctime_r(tp,buf);
 # endif	  
+
 #else
-# if defined( LDAP_INT_CTIME_MUTEX )
+# ifdef LDAP_R_COMPILE
 	ldap_pvt_thread_mutex_lock( &ldap_int_ctime_mutex );
-# endif	
+# endif
 	memcpy( buf, ctime(tp), 26 );
-# if defined( LDAP_INT_CTIME_MUTEX )
+# ifdef LDAP_R_COMPILE
 	ldap_pvt_thread_mutex_unlock( &ldap_int_ctime_mutex );
-# endif	
+# endif
 	return buf;
 #endif	
 }
@@ -158,7 +103,8 @@ int ldap_pvt_gethostbyname_a(
 	struct hostent **result,
 	int *herrno_ptr )
 {
-#if defined( HAVE_GETHOSTBYNAME_R ) || defined( HAVE_REENTRANT_FUNCTIONS )
+#if defined( HAVE_GETHOSTBYNAME_R )
+
 # define NEED_SAFE_REALLOC 1   
 	int r=-1;
 	int buflen=BUFSTART;
@@ -166,8 +112,19 @@ int ldap_pvt_gethostbyname_a(
 	for(;buflen<BUFMAX;) {
 		if (safe_realloc( buf, buflen )==NULL)
 			return r;
+
+#if (GETHOSTBYNAME_R_NARGS < 6)
+		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",
+		       name, r, 0 );
+
 #ifdef NETDB_INTERNAL
 		if ((r<0) &&
 			(*herrno_ptr==NETDB_INTERNAL) &&
@@ -180,7 +137,7 @@ int ldap_pvt_gethostbyname_a(
 		return r;
 	}
 	return -1;
-#elif defined( LDAP_INT_GETHOSTBYNAME_MUTEX )
+#elif defined( LDAP_R_COMPILE )
 # define NEED_COPY_HOSTENT   
 	struct hostent *he;
 	int	retval;
@@ -225,7 +182,8 @@ int ldap_pvt_gethostbyaddr_a(
 	struct hostent **result,
 	int *herrno_ptr )
 {
-#if defined( HAVE_GETHOSTBYADDR_R ) || defined( HAVE_REENTRANT_FUNCTIONS )
+#if defined( HAVE_GETHOSTBYADDR_R )
+
 # undef NEED_SAFE_REALLOC
 # define NEED_SAFE_REALLOC   
 	int r=-1;
@@ -234,9 +192,17 @@ int ldap_pvt_gethostbyaddr_a(
 	for(;buflen<BUFMAX;) {
 		if (safe_realloc( buf, buflen )==NULL)
 			return r;
+#if (GETHOSTBYADDR_R_NARGS < 8)
+		r = ((*result=gethostbyaddr_r( addr, len, type,
+					       resbuf, *buf, buflen, 
+					       herrno_ptr )) == NULL) ?
+		    -1 : 0;
+#else
 		r = gethostbyaddr_r( addr, len, type,
 			resbuf, *buf, buflen, 
 			result, herrno_ptr );
+#endif
+
 #ifdef NETDB_INTERNAL
 		if ((r<0) &&
 			(*herrno_ptr==NETDB_INTERNAL) &&
@@ -249,7 +215,7 @@ int ldap_pvt_gethostbyaddr_a(
 		return r;
 	}
 	return -1;
-#elif defined( LDAP_INT_GETHOSTBYADDR_MUTEX )
+#elif defined( LDAP_R_COMPILE )
 # undef NEED_COPY_HOSTENT
 # define NEED_COPY_HOSTENT   
 	struct hostent *he;
@@ -283,27 +249,32 @@ 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)
 	  return;
 	done=1;
-#if defined( LDAP_INT_CTIME_MUTEX )
-	ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex, NULL );
-#endif	
-#if defined( LDAP_INT_GETHOSTBYNAME_MUTEX )
-	ldap_pvt_thread_mutex_init( &ldap_int_gethostbyname_mutex, NULL );
+
+#ifdef LDAP_R_COMPILE
+
+#if !defined( USE_CTIME_R ) && !defined( HAVE_REENTRANT_FUNCTIONS )
+	ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex );
 #endif
-#if defined( LDAP_INT_GETHOSTBYADDR_MUTEX )
-	ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex, NULL );
+
+#if !defined( HAVE_GETHOSTBYNAME_R )
+	ldap_pvt_thread_mutex_init( &ldap_int_gethostbyname_mutex );
 #endif
-#if defined( LDAP_R_COMPILE )
+
+#if !defined( HAVE_GETHOSTBYADDR_R )
+	ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex );
+#endif
+
 	/* call other module init functions here... */
-#endif	
+#endif
 }
 
 #if defined( NEED_COPY_HOSTENT )
@@ -353,7 +324,7 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src )
 	
 	for( n_alias=total_alias_len=0, p=src->h_aliases; (*p) ; p++ ) {
 		total_alias_len += strlen( *p ) + 1;
-		n_alias++;
+		n_alias++; 
 	}
 
 	for( n_addr=0, p=src->h_addr_list; (*p) ; p++ ) {
@@ -389,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;
 	}