X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcharray.c;h=6ce0999294c0fcbfe36462c978a0072efefe7345;hb=af423fd393488947252da5fd6cd927edfd1bf110;hp=c2eb56ceaa06b5c57acc202d96c02be05f2a6107;hpb=cfa450d078d2595b01b2d2a83555932dc788ad1c;p=openldap

diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index c2eb56ceaa..6ce0999294 100644
--- 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 = ldap_pvt_strtok( str, brkstr, &lasts );
+		s != NULL;
+		s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
+	{
 		res[i++] = ch_strdup( s );
 	}
+
 	res[i] = NULL;
 
 	free( str );