/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
int
slapadd( int argc, char **argv )
{
- char *buf = NULL;
- int lineno;
- int lmax;
- int rc = EXIT_SUCCESS;
-
+ char *buf = NULL;
const char *text;
char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
size_t textlen = sizeof textbuf;
const char *progname = "slapadd";
- int manage = 0;
struct berval csn;
struct berval maxcsn;
- int match;
+ struct berval bvtext;
Attribute *attr;
Entry *ctxcsn_e;
ID ctxcsn_id, id;
+ OperationBuffer opbuf;
+ Operation *op;
+
+ int match;
int ret;
- struct berval bvtext;
int checkvals;
+ int lineno, nextline;
+ int lmax;
+ int rc = EXIT_SUCCESS;
+ int manage = 0;
+
slap_tool_init( progname, SLAPADD, argc, argv );
+ memset( &opbuf, 0, sizeof(opbuf) );
+ op = &opbuf.ob_op;
+ op->o_hdr = &opbuf.ob_hdr;
+
if( !be->be_entry_open ||
!be->be_entry_close ||
- !be->be_entry_put )
+ !be->be_entry_put ||
+ (update_ctxcsn &&
+ (!be->be_dn2id_get ||
+ !be->be_id2entry_get ||
+ !be->be_entry_modify)) )
{
fprintf( stderr, "%s: database doesn't support necessary operations.\n",
progname );
checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
lmax = 0;
- lineno = 0;
+ nextline = 0;
if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
fprintf( stderr, "%s: could not open database.\n",
maxcsn.bv_len = 0;
}
- while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
- Entry *e = str2entry2( buf, checkvals );
+ /* nextline is the line number of the end of the current entry */
+ for( lineno=1; ldif_read_record( ldiffp, &nextline, &buf, &lmax );
+ lineno=nextline+1 ) {
+ Entry *e;
+
+ if ( lineno < jumpline )
+ continue;
+
+ e = str2entry2( buf, checkvals );
/*
* Initialize text buffer
}
/* check backend */
- if( select_backend( &e->e_nname, is_entry_referral(e), nosubordinates )
+ if( select_backend( &e->e_nname, nosubordinates )
!= be )
{
fprintf( stderr, "%s: line %d: "
}
{
- Attribute *sc = attr_find( e->e_attrs,
- slap_schema.si_ad_structuralObjectClass );
Attribute *oc = attr_find( e->e_attrs,
slap_schema.si_ad_objectClass );
break;
}
- if( sc == NULL ) {
- struct berval val;
+ /* check schema */
+ op->o_bd = be;
- rc = structural_class( oc->a_vals, &val,
- NULL, &text, textbuf, textlen );
+ if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+ rc = entry_schema_check( op, e, NULL, manage, 1,
+ &text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
if( continuemode ) continue;
break;
}
-
- attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
- &val, NULL );
- }
-
- /* check schema */
- rc = entry_schema_check( be, 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;
}
}
if( continuemode ) continue;
break;
}
- }
-
- if ( verbose ) {
- if ( dryrun ) {
- fprintf( stderr, "added: \"%s\"\n",
- e->e_dn );
- } else {
+ if ( verbose )
fprintf( stderr, "added: \"%s\" (%08lx)\n",
e->e_dn, (long) id );
- }
+ } else {
+ if ( verbose )
+ fprintf( stderr, "added: \"%s\"\n",
+ e->e_dn );
}
entry_free( e );