/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
#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 char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+static char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
-int
-slapadd( int argc, char **argv )
+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;
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;
- struct berval bvtext;
- Attribute *attr;
- Entry *ctxcsn_e;
- ID ctxcsn_id, id;
- OperationBuffer opbuf;
- Operation *op;
-
- int match;
- int ret;
- int checkvals;
- int lineno;
- int lmax;
- int rc = EXIT_SUCCESS;
- int manage = 0;
-
- slap_tool_init( progname, SLAPADD, argc, argv );
-
- memset( &opbuf, 0, sizeof(opbuf) );
- op = (Operation *) &opbuf;
-
- if( !be->be_entry_open ||
- !be->be_entry_close ||
- !be->be_entry_put ||
- (update_ctxcsn &&
- (!be->be_dn2id_get ||
- !be->be_id2entry_get ||
- !be->be_entry_modify)) )
+ 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 );
- if ( dryrun ) {
- fprintf( stderr, "\t(dry) continuing...\n" );
-
- } else {
- exit( EXIT_FAILURE );
- }
- }
+ BackendDB *bd;
+ Entry *e;
- checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
+ if ( erec->lineno < jumpline )
+ goto again;
- lmax = 0;
- lineno = 0;
+ e = str2entry2( buf, checkvals );
- if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
- fprintf( stderr, "%s: could not open database.\n",
- progname );
- exit( EXIT_FAILURE );
- }
-
- if ( update_ctxcsn ) {
- maxcsn.bv_val = maxcsnbuf;
- maxcsn.bv_len = 0;
- }
-
- while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
- Entry *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( BER_BVISEMPTY( &e->e_nname ) &&
- !BER_BVISEMPTY( be->be_nsuffix )) {
- fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n",
- progname, e->e_dn, lineno );
- rc = EXIT_FAILURE;
+ !BER_BVISEMPTY( be->be_nsuffix ))
+ {
+ fprintf( stderr, "%s: line %d: "
+ "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++;
+ }
+
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
+
+ }
+ fprintf( stderr, "\n" );
entry_free( e );
- if( continuemode ) continue;
- break;
+ return -2;
}
/* check backend */
- if( select_backend( &e->e_nname, is_entry_referral(e), nosubordinates )
- != be )
- {
+ bd = select_backend( &e->e_nname, nosubordinates );
+ if ( bd != be ) {
fprintf( stderr, "%s: line %d: "
- "database (%s) not configured to hold \"%s\"\n",
- progname, lineno,
- be ? be->be_suffix[0].bv_val : "<none>",
+ "database #%d (%s) not configured to hold \"%s\"",
+ progname, erec->lineno,
+ dbnum,
+ be->be_suffix[0].bv_val,
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;
- }
-
- {
- Attribute *sc = attr_find( e->e_attrs,
- slap_schema.si_ad_structuralObjectClass );
- Attribute *oc = attr_find( e->e_attrs,
- slap_schema.si_ad_objectClass );
-
- 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;
- }
-
- if( sc == NULL ) {
- struct berval val;
-
- rc = structural_class( oc->a_vals, &val,
- 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 ( bd ) {
+ BackendDB *bdtmp;
+ int dbidx = 0;
+ LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+ if ( bdtmp == bd ) break;
+ dbidx++;
}
- attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
- &val, NULL );
- }
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
- /* check schema */
- op->o_bd = be;
-
- rc = entry_schema_check( op, e, NULL, manage,
- &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;
+ } else {
+ fprintf( stderr, "; no database configured for that naming context" );
}
+ fprintf( stderr, "\n" );
+ entry_free( e );
+ return -2;
+ }
+
+ 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 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;
- 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;
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( 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 ( update_ctxcsn ) {
- attr = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN );
- if ( maxcsn.bv_len != 0 ) {
- match = 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 ) {
- strcpy( maxcsn.bv_val, attr->a_nvals[0].bv_val );
- maxcsn.bv_len = attr->a_nvals[0].bv_len;
- }
+ 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;
+}
+
+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;
+}
+
+static int ldif_threaded;
+
+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;
+}
+
+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 );
+ }
+ }
+
+ 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;
+ }
+ }
+
+ /* enforce schema checking unless not disabled */
+ if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+ SLAP_DBFLAGS(be) &= ~(SLAP_DBFLAG_NO_SCHEMA_CHECK);
+ }
+
+ if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
+ fprintf( stderr, "%s: could not open database.\n",
+ progname );
+ exit( EXIT_FAILURE );
+ }
+
+ (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;
+ }
+
+ 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;
+ }
+
+ erec.nextline = 0;
+ erec.e = NULL;
+
+ for (;;) {
+ ldifrc = getrec( &erec );
+ if ( ldifrc < 1 ) {
+ if ( ldifrc == -2 && continuemode )
+ continue;
+ break;
}
if ( !dryrun ) {
- id = be->be_entry_put( be, e, &bvtext );
+ /*
+ * 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, e->e_dn,
- lineno, bvtext.bv_val );
+ "(line=%d): %s\n", progname, erec.e->e_dn,
+ erec.lineno, bvtext.bv_val );
rc = EXIT_FAILURE;
- entry_free( e );
- if( continuemode ) continue;
+ if( continuemode ) {
+ if ( prev ) entry_free( prev );
+ prev = erec.e;
+ continue;
+ }
break;
}
if ( verbose )
fprintf( stderr, "added: \"%s\" (%08lx)\n",
- e->e_dn, (long) id );
+ erec.e->e_dn, (long) id );
} else {
if ( verbose )
fprintf( stderr, "added: \"%s\"\n",
- e->e_dn );
+ erec.e->e_dn );
}
- entry_free( e );
+ if ( prev ) entry_free( prev );
+ prev = erec.e;
+ }
+
+ 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 ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && maxcsn.bv_len ) {
- ctxcsn_id = be->be_dn2id_get( be, be->be_nsuffix );
- if ( ctxcsn_id == NOID ) {
- fprintf( stderr, "%s: context entry is missing\n", progname );
- rc = EXIT_FAILURE;
- } 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 );
- if ( attr ) {
- 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 );
- if ( match > 0 ) {
- 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;
- }
- } else {
- match = 1;
- attr_merge_one( ctxcsn_e, slap_schema.si_ad_contextCSN, &maxcsn, NULL );
- }
- if ( match > 0 ) {
- ctxcsn_id = be->be_entry_modify( be, ctxcsn_e, &bvtext );
- if( ctxcsn_id == NOID ) {
- fprintf( stderr, "%s: could not modify ctxcsn\n",
- progname);
- rc = EXIT_FAILURE;
- } else if ( verbose ) {
- fprintf( stderr, "modified: \"%s\" (%08lx)\n",
- ctxcsn_e->e_dn, (long) ctxcsn_id );
- }
- }
- }
- }
+ 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 ( !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 ( enable_meter ) {
+ fprintf( stderr, "\n" );
+ }
}
- slap_tool_destroy();
+ if ( slap_tool_destroy())
+ rc = EXIT_FAILURE;
return rc;
}
projects / openldap / blobdiff