X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ftools%2Fldif2ldbm.c;h=1f1c641729aee7228649ac63e73db1d4ff0cfe4f;hb=3c20cffccda737f39c04affcb2093565d3c4b116;hp=41b93676b0167f4fa4dab41071e2282a22fdef50;hpb=0a7ca1e8d2f575f1a0c65932eb1e26136656c128;p=openldap

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 41b93676b0..1f1c641729 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -20,27 +20,6 @@
 #define ID2CHILDRENCMD		"ldif2id2children"
 #define MAXARGS      		100
 
-int		ldap_debug;
-int		ldap_syslog;
-int		ldap_syslog_level;
-long		num_entries_sent;
-long		num_bytes_sent;
-int		active_threads;
-char		*default_referral;
-time_t		currenttime;
-pthread_t	listener_tid;
-pthread_mutex_t	num_sent_mutex;
-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	replog_mutex;
-pthread_mutex_t	ops_mutex;
-pthread_mutex_t	regex_mutex;
-#ifdef SLAPD_CRYPT
-pthread_mutex_t	crypt_mutex;
-#endif
-
 static void fork_child( char *prog, char *args[] );
 static void	wait4kids( int nkidval );
 
@@ -62,7 +41,7 @@ main( int argc, char **argv )
 {
 	int		i, stop, status;
 	char		*linep, *buf, *sbindir;
-	char		*args[10];
+	char		*args[MAXARGS];
 	char		buf2[20], buf3[20];
 	char		line[BUFSIZ];
 	char		cmd[MAXPATHLEN];
@@ -230,8 +209,8 @@ main( int argc, char **argv )
 		int		vlen, indexmask, syntaxmask;
 		Datum		key, data;
 
-		memset( &key, 0, sizeof( key ));
-		memset( &data, 0, sizeof( data ));
+		ldbm_datum_init( key );
+		ldbm_datum_init( data );
 
 		if ( fgets( line, sizeof(line), stdin ) != NULL ) {
 			int     len;