int
main( int argc, char **argv )
{
- char *buf;
+ char *buf = NULL;
int lineno;
int lmax;
int rc = EXIT_SUCCESS;
const char *text;
- char textbuf[SLAP_TEXT_BUFLEN];
+ char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
size_t textlen = sizeof textbuf;
slap_tool_init( "slapadd", SLAPADD, argc, argv );
exit( EXIT_FAILURE );
}
- buf = NULL;
lmax = 0;
lineno = 0;
}
while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
- ID id;
Entry *e = str2entry( buf );
+ struct berval bvtext;
+
+ bvtext.bv_len = textlen;
+ bvtext.bv_val = textbuf;
if( e == NULL ) {
fprintf( stderr, "%s: could not parse entry (line=%d)\n",
fprintf( stderr, "%s: line %d: "
"database (%s) not configured to hold \"%s\"\n",
progname, lineno,
- be ? be->be_suffix[0]->bv_val : "<none>",
+ 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>",
+ be ? be->be_nsuffix[0].bv_val : "<none>",
e->e_ndn );
rc = EXIT_FAILURE;
entry_free( e );
if( sc == NULL ) {
struct berval vals[2];
- int ret = structural_class( oc->a_vals, vals,
+ /* int ret = */
+ structural_class( oc->a_vals, vals,
NULL, &text, textbuf, textlen );
if( vals[0].bv_len == 0 ) {
}
}
- id = be->be_entry_put( be, e );
- if( id == NOID ) {
- fprintf( stderr, "%s: could not add entry dn=\"%s\" (line=%d)\n",
- progname, e->e_dn, lineno );
- rc = EXIT_FAILURE;
- entry_free( e );
- if( continuemode ) continue;
- break;
-
- }
+ 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 );
+ 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 );
+ }
}
entry_free( e );