Import unprotected strtok fix from -devel. Yes, you have to edit 8 files

to add a simple mutex.  Should be two (proto-slap.h & init.c).

servers/slapd/charray.c

@@ -128,10 +128,16 @@ str2charray( char *str, char *brkstr )
 
 	res = (char **) ch_malloc( (i + 1) * sizeof(char *) );
 	i = 0;
+
+	pthread_mutex_lock(&strtok_mutex);
+
 	for ( s = strtok( str, brkstr ); s != NULL; s = strtok( NULL,
 	    brkstr ) ) {
 		res[i++] = ch_strdup( s );
 	}
+
+	pthread_mutex_unlock(&strtok_mutex);
+
 	res[i] = NULL;
 
 	free( str );

servers/slapd/init.c

@@ -17,6 +17,7 @@ init( void )
 	pthread_mutex_init( &active_threads_mutex, pthread_mutexattr_default );
 	pthread_mutex_init( &new_conn_mutex, pthread_mutexattr_default );
 	pthread_mutex_init( &currenttime_mutex, pthread_mutexattr_default );
+	pthread_mutex_init( &strtok_mutex, pthread_mutexattr_default );
 	pthread_mutex_init( &entry2str_mutex, pthread_mutexattr_default );
 	pthread_mutex_init( &replog_mutex, pthread_mutexattr_default );
 	pthread_mutex_init( &ops_mutex, pthread_mutexattr_default );

servers/slapd/main.c

@@ -36,6 +36,7 @@ char		**g_argv;
  */
 time_t		currenttime;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 int		active_threads;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;

servers/slapd/proto-slap.h

@@ -241,6 +241,7 @@ extern long		ops_completed;
 extern long		ops_initiated;
 extern pthread_mutex_t	active_threads_mutex;
 extern pthread_mutex_t	currenttime_mutex;
+extern pthread_mutex_t	strtok_mutex;
 extern pthread_mutex_t	entry2str_mutex;
 extern pthread_mutex_t	new_conn_mutex;
 extern pthread_mutex_t	num_sent_mutex;

servers/slapd/tools/ldbmtest.c

@@ -49,6 +49,7 @@ pthread_mutex_t	entry2str_mutex;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 pthread_mutex_t	replog_mutex;
 pthread_mutex_t	ops_mutex;
 pthread_mutex_t	regex_mutex;

servers/slapd/tools/ldif2id2children.c

@@ -31,6 +31,7 @@ pthread_mutex_t	entry2str_mutex;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 pthread_mutex_t	replog_mutex;
 pthread_mutex_t	ops_mutex;
 pthread_mutex_t	regex_mutex;

servers/slapd/tools/ldif2id2entry.c

@@ -28,6 +28,7 @@ pthread_mutex_t	entry2str_mutex;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 pthread_mutex_t	replog_mutex;
 pthread_mutex_t	ops_mutex;
 pthread_mutex_t	regex_mutex;

servers/slapd/tools/ldif2index.c

@@ -30,6 +30,7 @@ pthread_mutex_t	entry2str_mutex;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 pthread_mutex_t	replog_mutex;
 pthread_mutex_t	ops_mutex;
 pthread_mutex_t	regex_mutex;

servers/slapd/tools/ldif2ldbm.c

@@ -34,6 +34,7 @@ pthread_mutex_t	entry2str_mutex;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
 pthread_mutex_t	currenttime_mutex;
+pthread_mutex_t	strtok_mutex;
 pthread_mutex_t	replog_mutex;
 pthread_mutex_t	ops_mutex;
 pthread_mutex_t	regex_mutex;