X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=8823c6009bec788b7cc9ab2008e9f0adb33c0f7c;hb=470b126e9f94d08b46765545fcaf8b623913bfa4;hp=0d164f2b8dd6c56ca5ab7fe11739d6a752fb50c2;hpb=c1b50022e5482f6de6ab423b0bf0fbfdb102df8b;p=openldap

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 0d164f2b8d..58041d3026 100644
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -35,178 +35,150 @@
 #include <lber.h>
 #include <ldif.h>
 #include <lutil.h>
+#include <lutil_meter.h>
+#include <sys/stat.h>
 
 #include "slapcommon.h"
 
-static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-static const struct berval slap_syncrepl_bvc = BER_BVC("syncreplxxx");
-static const struct berval slap_syncrepl_cn_bvc = BER_BVC("cn=syncreplxxx");
-static struct berval slap_syncrepl_bv = BER_BVNULL;
-static struct berval slap_syncrepl_cn_bv = BER_BVNULL;
-
-struct subentryinfo {
-	struct berval cn;
-	struct berval ndn;
-	struct berval rdn;
-	struct berval cookie;
-	LDAP_SLIST_ENTRY( subentryinfo ) sei_next;
-};
-
-int
-slapadd( int argc, char **argv )
+static char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
+
+typedef struct Erec {
+	Entry *e;
+	int lineno;
+	int nextline;
+} Erec;
+
+typedef struct Trec {
+	Entry *e;
+	int lineno;
+	int nextline;
+	int rc;
+	int ready;
+} Trec;
+
+static Trec trec;
+static unsigned long sid = SLAP_SYNC_SID_MAX + 1;
+static int checkvals;
+static int enable_meter;
+static lutil_meter_t meter;
+static const char *progname = "slapadd";
+static OperationBuffer opbuf;
+static char *buf;
+static int lmax;
+
+static ldap_pvt_thread_mutex_t add_mutex;
+static ldap_pvt_thread_cond_t add_cond;
+static int add_stop;
+
+/* returns:
+ *	1: got a record
+ *	0: EOF
+ * -1: read failure
+ * -2: parse failure
+ */
+static int
+getrec0(Erec *erec)
 {
-	char		*buf = NULL;
-	int         lineno;
-	int         lmax;
-	int			rc = EXIT_SUCCESS;
-
 	const char *text;
+	int ldifrc;
 	char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
 	size_t textlen = sizeof textbuf;
-	const char *progname = "slapadd";
-
 	struct berval csn;
-	struct berval maxcsn = { 0, NULL };
-	struct berval ldifcsn = { 0, NULL };
-	int match;
-	int	provider_subentry = 0;
-	struct subentryinfo *sei;
-	LDAP_SLIST_HEAD( consumer_subentry_slist, subentryinfo ) consumer_subentry;
-	Attribute *attr;
-	Entry *ctxcsn_e;
-	ID	ctxcsn_id;
-	struct berval	ctxcsn_ndn = { 0, NULL };
-	int ret;
-	struct berval bvtext;
-	int i;
-	struct berval mc;
-	struct sync_cookie sc;
-#ifdef NEW_LOGGING
-	lutil_log_initialize(argc, argv );
-#endif
-	slap_tool_init( progname, SLAPADD, argc, argv );
-
-	LDAP_SLIST_INIT( &consumer_subentry );
-
-	if( !be->be_entry_open ||
-		!be->be_entry_close ||
-		!be->be_entry_put )
+	Operation *op = &opbuf.ob_op;
+	op->o_hdr = &opbuf.ob_hdr;
+
+again:
+	erec->lineno = erec->nextline+1;
+	/* nextline is the line number of the end of the current entry */
+	ldifrc = ldif_read_record( ldiffp, &erec->nextline, &buf, &lmax );
+	if (ldifrc < 1)
+		return ldifrc < 0 ? -1 : 0;
 	{
-		fprintf( stderr, "%s: database doesn't support necessary operations.\n",
-			progname );
-		exit( EXIT_FAILURE );
-	}
+		BackendDB *bd;
+		Entry *e;
 
-	lmax = 0;
-	lineno = 0;
+		if ( erec->lineno < jumpline )
+			goto again;
 
-	if( be->be_entry_open( be, 1 ) != 0 ) {
-		fprintf( stderr, "%s: could not open database.\n",
-			progname );
-		exit( EXIT_FAILURE );
-	}
-
-	while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
-		Entry *e = str2entry( buf );
+		e = str2entry2( buf, checkvals );
 
-		/*
-		 * Initialize text buffer
-		 */
-		bvtext.bv_len = textlen;
-		bvtext.bv_val = textbuf;
-		bvtext.bv_val[0] = '\0';
+		if ( enable_meter )
+			lutil_meter_update( &meter,
+					 ftell( ldiffp->fp ),
+					 0);
 
 		if( e == NULL ) {
 			fprintf( stderr, "%s: could not parse entry (line=%d)\n",
-				progname, lineno );
-			rc = EXIT_FAILURE;
-			if( continuemode ) continue;
-			break;
+				progname, erec->lineno );
+			return -2;
 		}
 
 		/* make sure the DN is not empty */
-		if( !e->e_nname.bv_len ) {
-			fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
-				progname, e->e_dn, lineno );
-			rc = EXIT_FAILURE;
-			entry_free( e );
-			if( continuemode ) continue;
-			break;
-		}
-
-		/* check backend */
-		if( select_backend( &e->e_nname, is_entry_referral(e), nosubordinates )
-			!= be )
+		if( BER_BVISEMPTY( &e->e_nname ) &&
+			!BER_BVISEMPTY( be->be_nsuffix ))
 		{
 			fprintf( stderr, "%s: line %d: "
-				"database (%s) not configured to hold \"%s\"\n",
-				progname, lineno,
-				be ? be->be_suffix[0].bv_val : "<none>",
-				e->e_dn );
-			fprintf( stderr, "%s: line %d: "
-				"database (%s) not configured to hold \"%s\"\n",
-				progname, lineno,
-				be ? be->be_nsuffix[0].bv_val : "<none>",
-				e->e_ndn );
-			rc = EXIT_FAILURE;
-			entry_free( e );
-			if( continuemode ) continue;
-			break;
-		}
+				"cannot add entry with empty dn=\"%s\"",
+				progname, erec->lineno, e->e_dn );
+			bd = select_backend( &e->e_nname, nosubordinates );
+			if ( bd ) {
+				BackendDB *bdtmp;
+				int dbidx = 0;
+				LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+					if ( bdtmp == bd ) break;
+					dbidx++;
+				}
 
-		if( global_schemacheck ) {
-			Attribute *sc = attr_find( e->e_attrs,
-				slap_schema.si_ad_structuralObjectClass );
-			Attribute *oc = attr_find( e->e_attrs,
-				slap_schema.si_ad_objectClass );
+				assert( bdtmp != NULL );
+				
+				fprintf( stderr, "; did you mean to use database #%d (%s)?",
+					dbidx,
+					bd->be_suffix[0].bv_val );
 
-			if( oc == NULL ) {
-				fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-					progname, e->e_dn, lineno,
-					"no objectClass attribute");
-				rc = EXIT_FAILURE;
-				entry_free( e );
-				if( continuemode ) continue;
-				break;
 			}
+			fprintf( stderr, "\n" );
+			entry_free( e );
+			return -2;
+		}
 
-			if( sc == NULL ) {
-				struct berval vals[2];
-
-				rc = structural_class( oc->a_vals, vals,
-					NULL, &text, textbuf, textlen );
-
-				if( rc != LDAP_SUCCESS ) {
-					fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
-						progname, e->e_dn, lineno, rc, text );
-					rc = EXIT_FAILURE;
-					entry_free( e );
-					if( continuemode ) continue;
-					break;
+		/* check backend */
+		bd = select_backend( &e->e_nname, nosubordinates );
+		if ( bd != be ) {
+			fprintf( stderr, "%s: line %d: "
+				"database #%d (%s) not configured to hold \"%s\"",
+				progname, erec->lineno,
+				dbnum,
+				be->be_suffix[0].bv_val,
+				e->e_dn );
+			if ( bd ) {
+				BackendDB *bdtmp;
+				int dbidx = 0;
+				LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+					if ( bdtmp == bd ) break;
+					dbidx++;
 				}
 
-				vals[1].bv_len = 0;
-				vals[1].bv_val = NULL;
+				assert( bdtmp != NULL );
+				
+				fprintf( stderr, "; did you mean to use database #%d (%s)?",
+					dbidx,
+					bd->be_suffix[0].bv_val );
 
-				attr_merge( e, slap_schema.si_ad_structuralObjectClass,
-					vals, NULL /* FIXME */ );
+			} else {
+				fprintf( stderr, "; no database configured for that naming context" );
 			}
+			fprintf( stderr, "\n" );
+			entry_free( e );
+			return -2;
+		}
 
-			/* check schema */
-			rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
-
-			if( rc != LDAP_SUCCESS ) {
-				fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
-					progname, e->e_dn, lineno, rc, text );
-				rc = EXIT_FAILURE;
-				entry_free( e );
-				if( continuemode ) continue;
-				break;
-			}
+		if ( slap_tool_entry_check( progname, op, e, erec->lineno, &text, textbuf, textlen ) !=
+			LDAP_SUCCESS ) {
+			entry_free( e );
+			return -2;
 		}
 
 		if ( SLAP_LASTMOD(be) ) {
-			struct tm *ltm;
 			time_t now = slap_get_time();
 			char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 			struct berval vals[ 2 ];
@@ -217,26 +189,30 @@ slapadd( int argc, char **argv )
 			struct berval nname;
 			char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
+			enum {
+				GOT_NONE = 0x0,
+				GOT_CSN = 0x1,
+				GOT_UUID = 0x2,
+				GOT_ALL = (GOT_CSN|GOT_UUID)
+			} got = GOT_ALL;
+
 			vals[1].bv_len = 0;
 			vals[1].bv_val = NULL;
 
 			nvals[1].bv_len = 0;
 			nvals[1].bv_val = NULL;
 
-			ltm = gmtime(&now);
-			lutil_gentime( timebuf, sizeof(timebuf), ltm );
-
-			csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
+			csn.bv_len = ldap_pvt_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
 			csn.bv_val = csnbuf;
 
 			timestamp.bv_val = timebuf;
-			timestamp.bv_len = strlen(timebuf);
+			timestamp.bv_len = sizeof(timebuf);
+
+			slap_timestamp( &now, &timestamp );
 
-			if ( be->be_rootndn.bv_len == 0 ) {
-				name.bv_val = SLAPD_ANONYMOUS;
-				name.bv_len = sizeof(SLAPD_ANONYMOUS) - 1;
-				nname.bv_val = SLAPD_ANONYMOUS;
-				nname.bv_len = sizeof(SLAPD_ANONYMOUS) - 1;
+			if ( BER_BVISEMPTY( &be->be_rootndn ) ) {
+				BER_BVSTR( &name, SLAPD_ANONYMOUS );
+				nname = name;
 			} else {
 				name = be->be_rootdn;
 				nname = be->be_rootndn;
@@ -245,10 +221,10 @@ slapadd( int argc, char **argv )
 			if( attr_find( e->e_attrs, slap_schema.si_ad_entryUUID )
 				== NULL )
 			{
+				got &= ~GOT_UUID;
 				vals[0].bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
 				vals[0].bv_val = uuidbuf;
-				attr_merge_normalize_one( e,
-							slap_schema.si_ad_entryUUID, vals, NULL );
+				attr_merge_normalize_one( e, slap_schema.si_ad_entryUUID, vals, NULL );
 			}
 
 			if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName )
@@ -259,442 +235,273 @@ slapadd( int argc, char **argv )
 				attr_merge( e, slap_schema.si_ad_creatorsName, vals, nvals );
 			}
 
-			if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName )
+			if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
 				== NULL )
 			{
-				vals[0] = name;
-				nvals[0] = nname;
-				attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals );
+				vals[0] = timestamp;
+				attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL );
 			}
 
-			if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
+			if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
 				== NULL )
 			{
-				vals[0] = timestamp;
-				attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL );
+				got &= ~GOT_CSN;
+				vals[0] = csn;
+				attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
 			}
 
-			if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp )
+			if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName )
 				== NULL )
 			{
-				vals[0] = timestamp;
-				attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL );
+				vals[0] = name;
+				nvals[0] = nname;
+				attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals );
 			}
 
-			if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
+			if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp )
 				== NULL )
 			{
-				vals[0] = csn;
-				attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
+				vals[0] = timestamp;
+				attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL );
 			}
 
-			if ( !is_entry_syncProviderSubentry( e ) &&
-				 !is_entry_syncConsumerSubentry( e ) &&
-				 update_ctxcsn != SLAP_TOOL_CTXCSN_KEEP ) {
-				attr = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN );
-				if ( maxcsn.bv_len != 0 ) {
-					value_match( &match, slap_schema.si_ad_entryCSN,
-						slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
-						SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-						&maxcsn, &attr->a_nvals[0], &text );
-				} else {
-					match = -1;
-				}
-				if ( match < 0 ) {
-					if ( maxcsn.bv_val )
-						ch_free( maxcsn.bv_val );
-					ber_dupbv( &maxcsn, &attr->a_nvals[0] );
-				}
+			if ( SLAP_SINGLE_SHADOW(be) && got != GOT_ALL ) {
+				char buf[SLAP_TEXT_BUFLEN];
+
+				snprintf( buf, sizeof(buf),
+					"%s%s%s",
+					( !(got & GOT_UUID) ? slap_schema.si_ad_entryUUID->ad_cname.bv_val : "" ),
+					( !(got & GOT_CSN) ? "," : "" ),
+					( !(got & GOT_CSN) ? slap_schema.si_ad_entryCSN->ad_cname.bv_val : "" ) );
+
+				Debug( LDAP_DEBUG_ANY, "%s: warning, missing attrs %s from entry dn=\"%s\"\n",
+					progname, buf, e->e_name.bv_val );
 			}
+
+			sid = slap_tool_update_ctxcsn_check( progname, e );
 		}
+		erec->e = e;
+	}
+	return 1;
+}
 
-		if ( update_ctxcsn == SLAP_TOOL_CTXCSN_KEEP &&
-			( replica_promotion || replica_demotion )) {
-			if ( is_entry_syncProviderSubentry( e )) { 
-				if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-					fprintf( stderr, "%s: consumer and provider subentries "
-									 "are both present\n", progname );
-					rc = EXIT_FAILURE;
-					entry_free( e );
-					sei = LDAP_SLIST_FIRST( &consumer_subentry );
-					while ( sei ) {
-						ch_free( sei->cn.bv_val );
-						ch_free( sei->ndn.bv_val );
-						ch_free( sei->rdn.bv_val );
-						ch_free( sei->cookie.bv_val );
-						LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-						ch_free( sei );
-						sei = LDAP_SLIST_FIRST( &consumer_subentry );
-					}
-					break;
-				}
-				if ( provider_subentry ) {
-					fprintf( stderr, "%s: multiple provider subentries are "
-							"present : add -w flag to refresh\n", progname );
-					rc = EXIT_FAILURE;
-					entry_free( e );
-					break;
-				}
-				attr = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN );
-				if ( attr == NULL ) {
-					entry_free( e );
-					continue;
-				}
-				provider_subentry = 1;
-				ber_dupbv( &maxcsn, &attr->a_nvals[0] );
-			} else if ( is_entry_syncConsumerSubentry( e )) {
-				if ( provider_subentry ) {
-					fprintf( stderr, "%s: consumer and provider subentries "
-									 "are both present\n", progname );
-					rc = EXIT_FAILURE;
-					entry_free( e );
-					break;
-				}
+static void *
+getrec_thr(void *ctx)
+{
+	ldap_pvt_thread_mutex_lock( &add_mutex );
+	while (!add_stop) {
+		trec.rc = getrec0((Erec *)&trec);
+		trec.ready = 1;
+		while (trec.ready)
+			ldap_pvt_thread_cond_wait( &add_cond, &add_mutex );
+		/* eof or read failure */
+		if ( trec.rc == 0 || trec.rc == -1 )
+			break;
+	}
+	ldap_pvt_thread_mutex_unlock( &add_mutex );
+	return NULL;
+}
 
-				attr = attr_find( e->e_attrs, slap_schema.si_ad_cn );
+static int ldif_threaded;
 
-				if ( attr == NULL ) {
-					entry_free( e );
-					continue;
-				}
+static int
+getrec(Erec *erec)
+{
+	int rc;
+	if ( !ldif_threaded )
+		return getrec0(erec);
+
+	while (!trec.ready)
+		ldap_pvt_thread_yield();
+	erec->e = trec.e;
+	erec->lineno = trec.lineno;
+	erec->nextline = trec.nextline;
+	trec.ready = 0;
+	rc = trec.rc;
+	ldap_pvt_thread_mutex_lock( &add_mutex );
+	ldap_pvt_thread_mutex_unlock( &add_mutex );
+	ldap_pvt_thread_cond_signal( &add_cond );
+	return rc;
+}
 
-				if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-					LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-						value_match( &match, slap_schema.si_ad_cn,
-							slap_schema.si_ad_cn->ad_type->sat_equality,
-							SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-							&sei->cn, &attr->a_nvals[0], &text );
-					}
-					if ( !match ) {
-						fprintf( stderr, "%s: multiple consumer subentries "
-								"have the same id : add -w flag to refresh\n",
-								progname );
-						rc = EXIT_FAILURE;
-						entry_free( e );
-						sei = LDAP_SLIST_FIRST( &consumer_subentry );
-						while ( sei ) {
-							ch_free( sei->cn.bv_val );
-							ch_free( sei->ndn.bv_val );
-							ch_free( sei->rdn.bv_val );
-							ch_free( sei->cookie.bv_val );
-							LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-							ch_free( sei );
-							sei = LDAP_SLIST_FIRST( &consumer_subentry );
-						}
-						break;
-					}
-				}
-				sei = ch_calloc( 1, sizeof( struct subentryinfo ));
-				ber_dupbv( &sei->cn, &attr->a_nvals[0] );
-				ber_dupbv( &sei->ndn, &e->e_nname );
-				dnExtractRdn( &sei->ndn, &sei->rdn, NULL );
-				attr = attr_find( e->e_attrs, slap_schema.si_ad_syncreplCookie );
-				if ( attr == NULL ) {
-					ch_free( sei->cn.bv_val );
-					ch_free( sei->ndn.bv_val );
-					ch_free( sei->rdn.bv_val );
-					ch_free( sei->cookie.bv_val );
-					ch_free( sei );
-					entry_free( e );
-					continue;
-				}
-				ber_dupbv( &sei->cookie, &attr->a_nvals[0] );
-				LDAP_SLIST_INSERT_HEAD( &consumer_subentry, sei, sei_next );
-			}
+int
+slapadd( int argc, char **argv )
+{
+	char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
+	size_t textlen = sizeof textbuf;
+	Erec erec;
+	struct berval bvtext;
+	ldap_pvt_thread_t thr;
+	ID id;
+	Entry *prev = NULL;
+
+	int ldifrc;
+	int rc = EXIT_SUCCESS;
+
+	struct stat stat_buf;
+
+	/* default "000" */
+	csnsid = 0;
+
+	if ( isatty (2) ) enable_meter = 1;
+	slap_tool_init( progname, SLAPADD, argc, argv );
+
+	if( !be->be_entry_open ||
+		!be->be_entry_close ||
+		!be->be_entry_put ||
+		(update_ctxcsn &&
+		 (!be->be_dn2id_get ||
+		  !be->be_entry_get ||
+		  !be->be_entry_modify)) )
+	{
+		fprintf( stderr, "%s: database doesn't support necessary operations.\n",
+			progname );
+		if ( dryrun ) {
+			fprintf( stderr, "\t(dry) continuing...\n" );
+
+		} else {
+			exit( EXIT_FAILURE );
 		}
+	}
 
-		if (( !is_entry_syncProviderSubentry( e ) &&
-			 !is_entry_syncConsumerSubentry( e )) ||
-			 ( !replica_promotion && !replica_demotion )) {
-			if (!dryrun) {
-				ID id = be->be_entry_put( be, e, &bvtext );
-				if( id == NOID ) {
-					fprintf( stderr, "%s: could not add entry dn=\"%s\" "
-									 "(line=%d): %s\n", progname, e->e_dn,
-									 lineno, bvtext.bv_val );
-					rc = EXIT_FAILURE;
-					entry_free( e );
-					if( continuemode ) continue;
-					break;
-				}
-	
-				if ( verbose ) {
-					fprintf( stderr, "added: \"%s\" (%08lx)\n",
-						e->e_dn, (long) id );
-				}
-			} else {
-				if ( verbose ) {
-					fprintf( stderr, "(dry) added: \"%s\"\n", e->e_dn );
-				}
-			}
+	checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
+
+	/* do not check values in quick mode */
+	if ( slapMode & SLAP_TOOL_QUICK ) {
+		if ( slapMode & SLAP_TOOL_VALUE_CHECK ) {
+			fprintf( stderr, "%s: value-check incompatible with quick mode; disabled.\n", progname );
+			slapMode &= ~SLAP_TOOL_VALUE_CHECK;
 		}
+	}
 
-		entry_free( e );
+	/* enforce schema checking unless not disabled */
+	if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+		SLAP_DBFLAGS(be) &= ~(SLAP_DBFLAG_NO_SCHEMA_CHECK);
 	}
 
-	bvtext.bv_len = textlen;
-	bvtext.bv_val = textbuf;
-	bvtext.bv_val[0] = '\0';
+	if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
+		fprintf( stderr, "%s: could not open database.\n",
+			progname );
+		exit( EXIT_FAILURE );
+	}
 
-	if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-		maxcsn.bv_len = 0;
-		maxcsn.bv_val = NULL;
-		LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-			sc.octet_str = &sei->cookie;
-			slap_parse_sync_cookie( &sc );
-			if ( maxcsn.bv_len != 0 ) {
-				value_match( &match, slap_schema.si_ad_syncreplCookie,
-					slap_schema.si_ad_syncreplCookie->ad_type->sat_ordering,
-					SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-					&maxcsn, &sc.ctxcsn[0], &text );
-			} else {
-				match = -1;
-			}
-			if ( match < 0 ) {
-				if ( maxcsn.bv_val )
-					ch_free( maxcsn.bv_val );
-				ber_dupbv( &maxcsn, &sc.ctxcsn[0] );
-			}
-			sc.octet_str = NULL;
-			slap_sync_cookie_free( &sc, 0 );
-		}
+	(void)slap_tool_update_ctxcsn_init();
+
+	if ( enable_meter
+#ifdef LDAP_DEBUG
+		/* tools default to "none" */
+		&& slap_debug == LDAP_DEBUG_NONE
+#endif
+		&& !fstat ( fileno ( ldiffp->fp ), &stat_buf )
+		&& S_ISREG(stat_buf.st_mode) ) {
+		enable_meter = !lutil_meter_open(
+			&meter,
+			&lutil_meter_text_display,
+			&lutil_meter_linear_estimator,
+			stat_buf.st_size);
+	} else {
+		enable_meter = 0;
 	}
 
-	slap_compose_sync_cookie( NULL, &mc, &maxcsn, -1, -1 );
-
-	if ( SLAP_LASTMOD(be) && replica_promotion ) {
-		if ( provider_subentry || update_ctxcsn == SLAP_TOOL_CTXCSN_BATCH ||
-			 !LDAP_SLIST_EMPTY( &consumer_subentry )) {
-			build_new_dn( &ctxcsn_ndn, &be->be_nsuffix[0],
-						  (struct berval *)&slap_ldapsync_cn_bv, NULL );
-			ctxcsn_id = be->be_dn2id_get( be, &ctxcsn_ndn );
-		
-			if ( ctxcsn_id == NOID ) {
-				ctxcsn_e = slap_create_context_csn_entry( be, &maxcsn );
-				if ( !dryrun ) {
-					ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-					if( ctxcsn_id == NOID ) {
-						fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-										 progname);
-						rc = EXIT_FAILURE;
-					}
-					if ( verbose ) {
-						fprintf( stderr, "added: \"%s\" (%08lx)\n",
-										 ctxcsn_e->e_dn, (long) ctxcsn_id );
-					}
-				} else {
-					if ( verbose ) {
-						fprintf( stderr, "(dry) added: \"%s\"\n", ctxcsn_e->e_dn );
-					}
-				}
-				entry_free( ctxcsn_e );
-			} else {
-				ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-				if ( ret == LDAP_SUCCESS ) {
-					attr = attr_find( ctxcsn_e->e_attrs,
-										slap_schema.si_ad_contextCSN );
-					AC_MEMCPY( attr->a_vals[0].bv_val, maxcsn.bv_val, maxcsn.bv_len );
-					attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0';
-					attr->a_vals[0].bv_len = maxcsn.bv_len;
-					if ( !dryrun ) {
-						ctxcsn_id = be->be_entry_modify( be, ctxcsn_e, &bvtext );
-						if( ctxcsn_id == NOID ) {
-							fprintf( stderr, "%s: could not modify ctxcsn "
-											 "subentry\n", progname);
-							rc = EXIT_FAILURE;
-						}
-						if ( verbose ) {
-							fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-											 ctxcsn_e->e_dn, (long) ctxcsn_id );
-						}
-					} else {
-						if ( verbose ) {
-							fprintf( stderr, "(dry) modified: \"%s\"\n",
-											 ctxcsn_e->e_dn );
-						}
-					}
-				} else {
-					fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-									 progname);
-					rc = EXIT_FAILURE;
-				}
-			}
-		} 
-	} else if ( SLAP_LASTMOD(be) && replica_demotion &&
-				( update_ctxcsn == SLAP_TOOL_CTXCSN_BATCH ||
-				provider_subentry )) {
-
-		ber_dupbv( &slap_syncrepl_bv, (struct berval *) &slap_syncrepl_bvc );
-		ber_dupbv( &slap_syncrepl_cn_bv,
-					(struct berval *) &slap_syncrepl_cn_bvc );
-
-		if ( replica_id_list == NULL ) {
-			replica_id_list = ch_calloc( 2, sizeof( int ));
-			replica_id_list[0] = 0;
-			replica_id_list[1] = -1;
-		}
+	if ( slap_tool_thread_max > 1 ) {
+		ldap_pvt_thread_mutex_init( &add_mutex );
+		ldap_pvt_thread_cond_init( &add_cond );
+		ldap_pvt_thread_create( &thr, 0, getrec_thr, NULL );
+		ldif_threaded = 1;
+	}
 
-		for ( i = 0; replica_id_list[i] > -1 ; i++ ) {
-			slap_syncrepl_bv.bv_len = snprintf( slap_syncrepl_bv.bv_val,
-									slap_syncrepl_bvc.bv_len,
-									"syncrepl%d", replica_id_list[i] );
-			slap_syncrepl_cn_bv.bv_len = snprintf( slap_syncrepl_cn_bv.bv_val,
-										slap_syncrepl_cn_bvc.bv_len,
-										"cn=syncrepl%d", replica_id_list[i] );
-			build_new_dn( &ctxcsn_ndn, &be->be_nsuffix[0],
-						  (struct berval *)&slap_syncrepl_cn_bv, NULL );
-			ctxcsn_id = be->be_dn2id_get( be, &ctxcsn_ndn );
-
-			if ( ctxcsn_id == NOID ) {
-				ctxcsn_e = slap_create_syncrepl_entry( be, &mc,
-												&slap_syncrepl_cn_bv,
-												&slap_syncrepl_bv );
-				if ( !dryrun ) {
-					ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-					if( ctxcsn_id == NOID ) {
-						fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-										 progname);
-						rc = EXIT_FAILURE;
-					}
-					if ( verbose ) {
-						fprintf( stderr, "added: \"%s\" (%08lx)\n",
-										 ctxcsn_e->e_dn, (long) ctxcsn_id );
-					}
-				} else {
-					if ( verbose ) {
-						fprintf( stderr, "(dry) added: \"%s\"\n",
-											ctxcsn_e->e_dn );
-					}
-				}
-				entry_free( ctxcsn_e );
-			} else {
-				ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-				if ( ret == LDAP_SUCCESS ) {
-					attr = attr_find( ctxcsn_e->e_attrs,
-									  slap_schema.si_ad_syncreplCookie );
-					AC_MEMCPY( attr->a_vals[0].bv_val, mc.bv_val, mc.bv_len );
-					attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0';
-					attr->a_vals[0].bv_len = maxcsn.bv_len;
-					if ( !dryrun ) {
-						ctxcsn_id = be->be_entry_modify( be,
-											ctxcsn_e, &bvtext );
-						if( ctxcsn_id == NOID ) {
-							fprintf( stderr, "%s: could not modify ctxcsn "
-											 "subentry\n", progname);
-							rc = EXIT_FAILURE;
-						}
-						if ( verbose ) {
-							fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-											 ctxcsn_e->e_dn, (long) ctxcsn_id );
-						}
-					} else {
-						if ( verbose ) {
-							fprintf( stderr, "(dry) modified: \"%s\"\n",
-											 ctxcsn_e->e_dn );
-						}
-					}
-				} else {
-					fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-									 progname);
-					rc = EXIT_FAILURE;
-				}
-			}
-		}
-		
-		if ( slap_syncrepl_bv.bv_val ) {
-			ch_free( slap_syncrepl_bv.bv_val );
-		}
-		if ( slap_syncrepl_cn_bv.bv_val ) {
-			ch_free( slap_syncrepl_cn_bv.bv_val );
+	erec.nextline = 0;
+	erec.e = NULL;
+
+	for (;;) {
+		ldifrc = getrec( &erec );
+		if ( ldifrc < 1 ) {
+			if ( ldifrc == -2 && continuemode )
+				continue;
+			break;
 		}
-	} else if ( SLAP_LASTMOD(be) && replica_demotion &&
-				!LDAP_SLIST_EMPTY( &consumer_subentry )) {
-
-		LDAP_SLIST_FOREACH( sei, &consumer_subentry, sei_next ) {
-			ctxcsn_id = be->be_dn2id_get( be, &sei->ndn );
-
-			if ( ctxcsn_id == NOID ) {
-				ctxcsn_e = slap_create_syncrepl_entry( be, &sei->cookie,
-												&sei->rdn, &sei->cn );
-				if ( !dryrun ) {
-					ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
-					if( ctxcsn_id == NOID ) {
-						fprintf( stderr, "%s: could not add ctxcsn subentry\n",
-										 progname);
-						rc = EXIT_FAILURE;
-					}
-					if ( verbose ) {
-						fprintf( stderr, "added: \"%s\" (%08lx)\n",
-										 ctxcsn_e->e_dn, (long) ctxcsn_id );
-					}
-				} else {
-					if ( verbose ) {
-						fprintf( stderr, "(dry) added: \"%s\"\n",
-											ctxcsn_e->e_dn );
-					}
-				}
-				entry_free( ctxcsn_e );
-			} else {
-				ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e );
-				if ( ret == LDAP_SUCCESS ) {
-					attr = attr_find( ctxcsn_e->e_attrs,
-									  slap_schema.si_ad_syncreplCookie );
-					AC_MEMCPY( attr->a_vals[0].bv_val, sei->cookie.bv_val, sei->cookie.bv_len );
-					attr->a_vals[0].bv_val[sei->cookie.bv_len] = '\0';
-					attr->a_vals[0].bv_len = sei->cookie.bv_len;
-					if ( !dryrun ) {
-						ctxcsn_id = be->be_entry_modify( be,
-											ctxcsn_e, &bvtext );
-						if( ctxcsn_id == NOID ) {
-							fprintf( stderr, "%s: could not modify ctxcsn "
-											 "subentry\n", progname);
-							rc = EXIT_FAILURE;
-						}
-						if ( verbose ) {
-							fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-											 ctxcsn_e->e_dn, (long) ctxcsn_id );
-						}
-					} else {
-						if ( verbose ) {
-							fprintf( stderr, "(dry) modified: \"%s\"\n",
-											 ctxcsn_e->e_dn );
-						}
-					}
-				} else {
-					fprintf( stderr, "%s: could not modify ctxcsn subentry\n",
-									 progname);
-					rc = EXIT_FAILURE;
+
+		if ( !dryrun ) {
+			/*
+			 * Initialize text buffer
+			 */
+			bvtext.bv_len = textlen;
+			bvtext.bv_val = textbuf;
+			bvtext.bv_val[0] = '\0';
+
+			id = be->be_entry_put( be, erec.e, &bvtext );
+			if( id == NOID ) {
+				fprintf( stderr, "%s: could not add entry dn=\"%s\" "
+								 "(line=%d): %s\n", progname, erec.e->e_dn,
+								 erec.lineno, bvtext.bv_val );
+				rc = EXIT_FAILURE;
+				if( continuemode ) {
+					if ( prev ) entry_free( prev );
+					prev = erec.e;
+					continue;
 				}
+				break;
 			}
+			if ( verbose )
+				fprintf( stderr, "added: \"%s\" (%08lx)\n",
+					erec.e->e_dn, (long) id );
+		} else {
+			if ( verbose )
+				fprintf( stderr, "added: \"%s\"\n",
+					erec.e->e_dn );
 		}
-		
-		if ( slap_syncrepl_bv.bv_val ) {
-			ch_free( slap_syncrepl_bv.bv_val );
-		}
-		if ( slap_syncrepl_cn_bv.bv_val ) {
-			ch_free( slap_syncrepl_cn_bv.bv_val );
-		}
+
+		if ( prev ) entry_free( prev );
+		prev = erec.e;
 	}
 
-	sei = LDAP_SLIST_FIRST( &consumer_subentry );
-	while ( sei ) {
-		ch_free( sei->cn.bv_val );
-		ch_free( sei->ndn.bv_val );
-		ch_free( sei->rdn.bv_val );
-		ch_free( sei->cookie.bv_val );
-		LDAP_SLIST_REMOVE_HEAD( &consumer_subentry, sei_next );
-		ch_free( sei );
-		sei = LDAP_SLIST_FIRST( &consumer_subentry );
+	if ( ldif_threaded ) {
+		ldap_pvt_thread_mutex_lock( &add_mutex );
+		add_stop = 1;
+		trec.ready = 0;
+		ldap_pvt_thread_cond_signal( &add_cond );
+		ldap_pvt_thread_mutex_unlock( &add_mutex );
+		ldap_pvt_thread_join( thr, NULL );
+	}
+	if ( erec.e ) entry_free( erec.e );
+
+	if ( ldifrc < 0 )
+		rc = EXIT_FAILURE;
+
+	bvtext.bv_len = textlen;
+	bvtext.bv_val = textbuf;
+	bvtext.bv_val[0] = '\0';
+
+	if ( enable_meter ) {
+		lutil_meter_update( &meter, ftell( ldiffp->fp ), 1);
+		lutil_meter_close( &meter );
+	}
+
+	if ( rc == EXIT_SUCCESS ) {
+		rc = slap_tool_update_ctxcsn( progname, sid, &bvtext );
 	}
 
 	ch_free( buf );
 
-	if( be->be_entry_close( be )) rc = EXIT_FAILURE;
+	if ( !dryrun ) {
+		if ( enable_meter ) {
+			fprintf( stderr, "Closing DB..." );
+		}
+		if( be->be_entry_close( be ) ) {
+			rc = EXIT_FAILURE;
+		}
 
-	if( be->be_sync ) {
-		be->be_sync( be );
+		if( be->be_sync ) {
+			be->be_sync( be );
+		}
+		if ( enable_meter ) {
+			fprintf( stderr, "\n" );
+		}
 	}
 
-	slap_tool_destroy();
+	if ( slap_tool_destroy())
+		rc = EXIT_FAILURE;
+
 	return rc;
 }
+