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

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 53c8fa008c..41b93676b0 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -23,12 +23,10 @@
 int		ldap_debug;
 int		ldap_syslog;
 int		ldap_syslog_level;
-int		global_schemacheck;
 long		num_entries_sent;
 long		num_bytes_sent;
 int		active_threads;
 char		*default_referral;
-struct objclass	*global_oc;
 time_t		currenttime;
 pthread_t	listener_tid;
 pthread_mutex_t	num_sent_mutex;
@@ -39,6 +37,9 @@ 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 );
@@ -70,6 +71,7 @@ main( int argc, char **argv )
 	int		dbnum;
 	ID		id;
 	Backend		*be = NULL;
+	struct ldbminfo *li;
 	struct berval	bv;
 	struct berval	*vals[2];
 	Avlnode		*avltypes = NULL;
@@ -146,6 +148,10 @@ main( int argc, char **argv )
 	}
 	be = &backends[dbnum];
 
+	/* disable write sync'ing */
+	li = (struct ldbminfo *) be->be_private;
+	li->li_dbcachewsync = 0;
+
 	/*
 	 * generate the id2entry index
 	 */
@@ -224,6 +230,9 @@ main( int argc, char **argv )
 		int		vlen, indexmask, syntaxmask;
 		Datum		key, data;
 
+		memset( &key, 0, sizeof( key ));
+		memset( &data, 0, sizeof( data ));
+
 		if ( fgets( line, sizeof(line), stdin ) != NULL ) {
 			int     len;