Set ciphers from slapd.conf.

[openldap] / libraries / libldap / string.c

diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index a0877bb68342b3d290a63d7ff2822dbd0552562d..494248531ecade80d5bfc09f19fd1072a4a55288 100644 (file)
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -5,7 +5,7 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -58,9 +58,6 @@ static char *(int_strpbrk)( const char *str, const char *accept )
 
 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) {
@@ -91,17 +88,16 @@ char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
        }
 
        return str;
-#endif
 }
 
 char *
 (ldap_pvt_strdup)( const char *s )
 {
        char    *p;
-       int     len = strlen( s ) + 1;
+       size_t  len = strlen( s ) + 1;
 
        if ( (p = (char *) malloc( len )) == NULL ) {
-               return( (char *)0 );
+               return( NULL );
        }
 
        memcpy( p, s, len );