Fix backend_destroy to call bi_destroy instead of bi_close

[openldap] / servers / slapd / charray.c

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index c2eb56ceaa06b5c57acc202d96c02be05f2a6107..741a0e15954cc7c62a429a3e6c4c1fceb04c4708 100644 (file)
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -114,6 +114,7 @@ str2charray( char *str, char *brkstr )
 {
        char    **res;
        char    *s;
+       char    *lasts;
        int     i;
 
        /* protect the input string from strtok */
@@ -128,10 +129,14 @@ str2charray( char *str, char *brkstr )
 
        res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
        i = 0;
-       for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
-           brkstr ) ) {
+
+       for ( s = strtok_r( str, brkstr, &lasts );
+               s != NULL;
+               s = strtok_r( NULL, brkstr, &lasts ) )
+       {
                res[i++] = ch_strdup( s );
        }
+
        res[i] = NULL;
 
        free( str );