Move ldap_utf8_*() declarations from ldap-int.h to ldap_pvt.h.

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

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 7ee5da8b576ca50227c4756e2f6933a9c8d44c98..158f23472f27eaa5748f3117e1a651a957140e6a 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>
@@ -63,13 +64,16 @@
 # ifndef HAVE_GETHOSTBYADDR_R
        static ldap_pvt_thread_mutex_t ldap_int_gethostbyaddr_mutex;
 # endif
+# ifdef HAVE_RES_SEARCH
+       ldap_pvt_thread_mutex_t ldap_int_resolv_mutex;
+# endif
 #endif /* LDAP_R_COMPILE */
 
 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
@@ -273,6 +277,10 @@ void ldap_int_utils_init( void )
        ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex );
 #endif
 
+#ifdef HAVE_RES_SEARCH
+       ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex );
+#endif
+
        /* call other module init functions here... */
 #endif
 }
@@ -360,7 +368,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;
        }