import ITS#3461 fix from HEAD

diff --git a/CHANGES b/CHANGES
index 3a521d74572790d96e62dfff260c46a2a6a710ad..b7c7863de84be65f7630c215319b721f1d2cdb9e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.2 Change Log
 OpenLDAP 2.2.21 Engineering
        Fixed slapd group limits
        Fixed slapd/slurpd replog locking (ITS#3421)
+       Fixed slaptest failure if databases cannot be started (ITS#3461)
        Fixed back-bdb entry e_ocflags reset on objectClass modify
        Fixed back-bdb detecting deadlock in indexer (ITS#3481)
        Build Environment

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 6a931617e0e0cf247092aa60203b9b103a565a74..75baed484b03a4d663b4db5f3e27b6f1746cb1fe 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -49,25 +49,29 @@ usage( int tool, const char *progname )
 {
        char *options = NULL;
        fprintf( stderr,
-               "usage: %s [-v] [-c] [-d debuglevel] [-f configfile]\n",
+               "usage: %s [-v] [-c] [-d debuglevel] [-f configfile]",
                progname );
 
        switch( tool ) {
        case SLAPADD:
-               options = "\t[-n databasenumber | -b suffix]\n"
+               options = "\n\t[-n databasenumber | -b suffix]\n"
                        "\t[-l ldiffile] [-u] [-p [-w] | -r [-i syncreplidlist] [-w]]\n";
                break;
 
        case SLAPCAT:
-               options = "\t[-n databasenumber | -b suffix] [-l ldiffile] [-m] [-k]\n";
+               options = "\n\t[-n databasenumber | -b suffix] [-l ldiffile] [-m] [-k]\n";
                break;
 
        case SLAPDN:
-               options = "\tDN [...]\n";
+               options = " DN [...]\n";
                break;
 
        case SLAPINDEX:
-               options = "\t[-n databasenumber | -b suffix]\n";
+               options = "\n\t[-n databasenumber | -b suffix]\n";
+               break;
+
+       case SLAPTEST:
+               options = " [-u]\n";
                break;
        }
 
@@ -121,8 +125,14 @@ slap_tool_init(
                break;
 
        case SLAPDN:
-       case SLAPTEST:
                options = "d:f:v";
+               mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
+               break;
+
+       case SLAPTEST:
+               options = "d:f:uv";
+               mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
+               break;
                break;
 
        case SLAPINDEX:
@@ -131,8 +141,7 @@ slap_tool_init(
                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 );
        }
 
@@ -140,8 +149,7 @@ slap_tool_init(
        while ( (i = getopt( argc, argv, options )) != EOF ) {
                switch ( i ) {
                case 'b':
-                       base.bv_val = strdup( optarg );
-                       base.bv_len = strlen( base.bv_val );
+                       ber_str2bv( optarg, 0, 1, &base );
                        break;
 
                case 'c':       /* enable continue mode */
@@ -270,7 +278,7 @@ slap_tool_init(
        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 );
@@ -348,7 +356,8 @@ slap_tool_init(
        switch ( tool ) {
        case SLAPDN:
        case SLAPTEST:
-               return;
+               be = NULL;
+               goto startup;
 
        default:
                break;
@@ -444,12 +453,26 @@ slap_tool_init(
                be = &backends[dbnum];
        }
 
+startup:;
+
 #ifdef CSRIMALLOC
        mal_leaktrace(1);
 #endif
 
        if ( !dryrun && slap_startup( be ) ) {
-               fprintf( stderr, "slap_startup failed\n" );
+
+               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;
+               }
+               
                exit( EXIT_FAILURE );
        }
 }