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

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 01ae4fbd21..1f1c641729 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -3,13 +3,16 @@
 #include <stdio.h>
 
 #include <ac/string.h>
+#include <ac/ctype.h>
 #include <ac/socket.h>
+#include <ac/unistd.h>
+#include <ac/wait.h>
 
 #include <sys/param.h>
 
+#include "ldapconfig.h"
 #include "../slap.h"
 #include "../back-ldbm/back-ldbm.h"
-#include "ldapconfig.h"
 #include "ldif.h"
 
 #define INDEXCMD		"ldif2index"
@@ -17,30 +20,6 @@
 #define ID2CHILDRENCMD		"ldif2id2children"
 #define MAXARGS      		100
 
-extern int		nbackends;
-extern Backend	*backends;
-extern int		ldap_debug;
-
-int		ldap_debug;
-int		ldap_syslog;
-int		ldap_syslog_level;
-int		global_schemacheck;
-int		num_entries_sent;
-int		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;
-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;
-
 static void fork_child( char *prog, char *args[] );
 static void	wait4kids( int nkidval );
 
@@ -49,7 +28,7 @@ static char	*tailorfile;
 static char	*inputfile;
 static int      maxkids = 1;
 static int      nkids;
- 
+
 static void
 usage( char *name )
 {
@@ -57,11 +36,12 @@ usage( char *name )
 	exit( 1 );
 }
 
+int
 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];
@@ -70,10 +50,10 @@ 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;
-	extern char	*optarg;
 
 	sbindir = DEFAULT_SBINDIR;
 	tailorfile = SLAPD_DEFAULT_CONFIGFILE;
@@ -147,6 +127,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
 	 */
@@ -225,6 +209,9 @@ main( int argc, char **argv )
 		int		vlen, indexmask, syntaxmask;
 		Datum		key, data;
 
+		ldbm_datum_init( key );
+		ldbm_datum_init( data );
+
 		if ( fgets( line, sizeof(line), stdin ) != NULL ) {
 			int     len;