break;
case SLAPCAT:
- options = "\t[-n databasenumber | -b suffix] [-l ldiffile] [-m] [-k]\n";
+ options = "\t[-n databasenumber | -b suffix]"
+ " [-l ldiffile] [-a filter] [-m] [-k]\n";
break;
case SLAPDN:
break;
case SLAPAUTH:
- options = "\t[-U authcID] [-X authzID] ID [...]\n";
+ options = "\t[-U authcID] [-X authzID] [-R realm] [-M mech] ID [...]\n";
break;
case SLAPACL:
- options = "\t[-U authcID | -D authcDN] -b DN attr[/level][:value] [...]\n";
+ options = "\t[-U authcID | -D authcDN]"
+ " -b DN [attr[/access][:value]] [...]\n";
break;
}
char *options;
char *conffile = SLAPD_DEFAULT_CONFIGFILE;
struct berval base = BER_BVNULL;
+ char *filterstr = NULL;
char *subtree = NULL;
char *ldiffile = NULL;
int rc, i, dbnum;
break;
case SLAPCAT:
- options = "b:cd:f:kl:mn:s:v";
+ options = "a:b:cd:f:kl:mn:s:v";
mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
break;
break;
case SLAPAUTH:
- options = "d:f:U:vX:";
+ options = "d:f:M:R:U:vX:";
mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
break;
break;
default:
- fprintf( stderr, "%s: unknown tool mode (%d)\n",
- progname, tool );
+ fprintf( stderr, "%s: unknown tool mode (%d)\n", progname, tool );
exit( EXIT_FAILURE );
}
dbnum = -1;
while ( (i = getopt( argc, argv, options )) != EOF ) {
switch ( i ) {
+ case 'a':
+ filterstr = strdup( optarg );
+ break;
+
case 'b':
ber_str2bv( optarg, 0, 1, &base );
break;
usage( tool, progname );
exit( EXIT_FAILURE );
}
- str2clist( &replica_id_strlist, replica_id_string, "," );
+ slap_str2clist( &replica_id_strlist, replica_id_string, "," );
for ( i = 0; replica_id_strlist && replica_id_strlist[i]; i++ ) ;
replica_id_list = ch_calloc( i + 1, sizeof( int ) );
for ( i = 0; replica_id_strlist && replica_id_strlist[i]; i++ ) {
retrieve_ctxcsn = 1;
break;
+ case 'M':
+ ber_str2bv( optarg, 0, 0, &mech );
+ break;
+
case 'n': /* which config file db to index */
dbnum = atoi( optarg ) - 1;
break;
replica_demotion = 1;
break;
+ case 'R':
+ realm = optarg;
+ break;
+
case 's': /* dump subtree */
subtree = strdup( optarg );
break;
break;
case SLAPACL:
- if ( argc == optind ) {
- usage( tool, progname );
- }
if ( !BER_BVISNULL( &authcDN ) && !BER_BVISNULL( &authcID ) ) {
usage( tool, progname );
}
if ( ldiffile == NULL ) {
ldiffp = tool == SLAPCAT ? stdout : stdin;
- } else if( (ldiffp = fopen( ldiffile, tool == SLAPCAT ? "w" : "r" ))
+ } else if ((ldiffp = fopen( ldiffile, tool == SLAPCAT ? "w" : "r" ))
== NULL )
{
perror( ldiffile );
exit( EXIT_FAILURE );
}
+ if ( frontend_init() ) {
+ fprintf( stderr, "%s: frontend_init failed!\n", progname );
+ exit( EXIT_FAILURE );
+ }
+
if ( overlay_init() ) {
fprintf( stderr, "%s: overlay_init failed!\n", progname );
exit( EXIT_FAILURE );
break;
}
- rc = glue_sub_init();
-
- if ( rc != 0 ) {
- fprintf( stderr, "Subordinate configuration error\n" );
- exit( EXIT_FAILURE );
- }
-
rc = slap_schema_check();
if ( rc != 0 ) {
break;
}
+ if( filterstr ) {
+ filter = str2filter( filterstr );
+
+ if( filter == NULL ) {
+ fprintf( stderr, "Invalid filter '%s'\n", filterstr );
+ exit( EXIT_FAILURE );
+ }
+ }
+
if( subtree ) {
struct berval val;
ber_str2bv( subtree, 0, 0, &val );
rc = dnNormalize( 0, NULL, NULL, &val, &sub_ndn, NULL );
if( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "Invalid subtree DN '%s'\n", optarg );
+ fprintf( stderr, "Invalid subtree DN '%s'\n", subtree );
exit( EXIT_FAILURE );
}
- if ( BER_BVISNULL( &base ) && dbnum == -1 )
+ if ( BER_BVISNULL( &base ) && dbnum == -1 ) {
base = val;
- else
+ } else {
free( subtree );
+ }
}
if( base.bv_val != NULL ) {
}
if ( nosubordinates == 0 && dbnum > 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACKEND, ERR,
-"The first database does not allow %s; using the first available one (%d)\n",
- progname, dbnum + 1, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
-"The first database does not allow %s; using the first available one (%d)\n",
+ "The first database does not allow %s;"
+ " using the first available one (%d)\n",
progname, dbnum + 1, 0 );
-#endif
}
} else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
fprintf( stderr,
"Database number selected via -n is out of range\n"
"Must be in the range 1 to %d"
- " (number of databases in the config file)\n",
+ " (number of databases in the config file)\n",
nbackends );
exit( EXIT_FAILURE );
void slap_tool_destroy( void )
{
- if ( !dryrun ) {
+ if ( !dryrun && be != NULL ) {
slap_shutdown( be );
}
slap_destroy();