case SLAPADD:
options = " [-c]\n\t[-g] [-n databasenumber | -b suffix]\n"
- "\t[-l ldiffile] [-q] [-u] [-w]\n";
+ "\t[-l ldiffile] [-q] [-u] [-s] [-w]\n";
break;
case SLAPAUTH:
switch( tool ) {
case SLAPADD:
- options = "b:cd:f:F:gl:n:qtuvw";
+ options = "b:cd:f:F:gl:n:qstuvw";
break;
case SLAPCAT:
break;
case 's': /* dump subtree */
- subtree = strdup( optarg );
+ if ( tool == SLAPADD )
+ mode |= SLAP_TOOL_NO_SCHEMA_CHECK;
+ else if ( tool == SLAPCAT )
+ subtree = strdup( optarg );
break;
case 't': /* turn on truncate */
}
/* slapdn doesn't specify a backend to startup */
- if ( !dryrun && tool != SLAPDN && slap_startup( be ) ) {
+ if ( !dryrun && tool != SLAPDN ) {
need_shutdown = 1;
- switch ( tool ) {
- case SLAPTEST:
- fprintf( stderr, "slap_startup failed "
- "(test would succeed using "
- "the -u switch)\n" );
- break;
+ if ( slap_startup( be ) ) {
+ switch ( tool ) {
+ case SLAPTEST:
+ fprintf( stderr, "slap_startup failed "
+ "(test would succeed using "
+ "the -u switch)\n" );
+ break;
+
+ default:
+ fprintf( stderr, "slap_startup failed\n" );
+ break;
+ }
- default:
- fprintf( stderr, "slap_startup failed\n" );
- break;
+ exit( EXIT_FAILURE );
}
-
- exit( EXIT_FAILURE );
}
}