/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
Attribute *attr;
Entry *ctxcsn_e;
ID ctxcsn_id, id;
+ OperationBuffer opbuf;
Operation *op;
- char opbuf[OPERATION_BUFFER_SIZE];
int match;
int ret;
int checkvals;
- int lineno;
+ 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 = (Operation *)opbuf;
+ memset( &opbuf, 0, sizeof(opbuf) );
+ op = (Operation *) &opbuf;
if( !be->be_entry_open ||
!be->be_entry_close ||
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 schema */
op->o_bd = be;
- rc = entry_schema_check( op, e, NULL, manage,
- &text, textbuf, textlen );
+ if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+ 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;
+ 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;
+ }
}
}