initialize AttributeAssertion before using

[openldap] / servers / slapd / slapcommon.c

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index b5134599d18219244f9647bc68073f00447c30c6..41642c6ceda19e2fcb818eded7d78ce624f89c58 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -60,7 +60,7 @@ usage( int tool, const char *progname )
 
        case SLAPADD:
                options = "\n\t[-n databasenumber | -b suffix]\n"
-                       "\t[-l ldiffile] [-u] [-p [-w] | -r [-i syncreplidlist] [-w]]\n";
+                       "\t[-l ldiffile] [-q] [-u] [-w]\n";
                break;
 
        case SLAPAUTH:
@@ -69,7 +69,7 @@ usage( int tool, const char *progname )
 
        case SLAPCAT:
                options = "\n\t[-n databasenumber | -b suffix]"
-                       " [-l ldiffile] [-a filter] [-m] [-k]\n";
+                       " [-l ldiffile] [-a filter]\n";
                break;
 
        case SLAPDN:
@@ -77,7 +77,7 @@ usage( int tool, const char *progname )
                break;
 
        case SLAPINDEX:
-               options = "\n\t[-n databasenumber | -b suffix]\n";
+               options = "\n\t[-n databasenumber | -b suffix] [-q]\n";
                break;
 
        case SLAPTEST:
@@ -117,7 +117,7 @@ slap_tool_init(
        int truncatemode = 0;
 
 #ifdef CSRIMALLOC
-       leakfilename = malloc( strlen( progname ) + STRLEOF( ".leak" ) - 1 );
+       leakfilename = malloc( strlen( progname ) + STRLENOF( ".leak" ) + 1 );
        sprintf( leakfilename, "%s.leak", progname );
        if( ( leakfile = fopen( leakfilename, "w" )) == NULL ) {
                leakfile = stderr;
@@ -127,11 +127,11 @@ slap_tool_init(
 
        switch( tool ) {
        case SLAPADD:
-               options = "b:cd:f:i:l:n:prtuvWw";
+               options = "b:cd:f:l:n:qtuvw";
                break;
 
        case SLAPCAT:
-               options = "a:b:cd:f:kl:mn:s:v";
+               options = "a:b:cd:f:l:n:s:v";
                mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
                break;
 
@@ -151,7 +151,7 @@ slap_tool_init(
                break;
 
        case SLAPINDEX:
-               options = "b:cd:f:n:v";
+               options = "b:cd:f:n:qv";
                mode |= SLAP_TOOL_READMAIN;
                break;
 
@@ -192,39 +192,10 @@ slap_tool_init(
                        conffile = strdup( optarg );
                        break;
 
-               case 'i': /* specify syncrepl id list */
-                       replica_id_string = strdup( optarg );
-                       if ( !isdigit( (unsigned char) *replica_id_string )) {
-                               usage( tool, progname );
-                               exit( EXIT_FAILURE );
-                       }
-                       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++ ) {
-                               replica_id_list[i] = atoi( replica_id_strlist[i] );
-                               if ( replica_id_list[i] >= 1000 ) {
-                                       fprintf(stderr,
-                                               "%s: syncrepl id %d is out of range [0..999]\n",
-                                               progname, replica_id_list[i] );
-                                       exit( EXIT_FAILURE );
-                               }
-                       }
-                       replica_id_list[i] = -1;
-                       break;
-
-               case 'k':       /* Retrieve sync cookie entry */
-                       retrieve_synccookie = 1;
-                       break;
-
                case 'l':       /* LDIF file */
                        ldiffile = strdup( optarg );
                        break;
 
-               case 'm':       /* Retrieve ldapsync entry */
-                       retrieve_ctxcsn = 1;
-                       break;
-
                case 'M':
                        ber_str2bv( optarg, 0, 0, &mech );
                        break;
@@ -233,12 +204,8 @@ slap_tool_init(
                        dbnum = atoi( optarg ) - 1;
                        break;
 
-               case 'p':       /* replica promotion */
-                       replica_promotion = 1;          
-                       break;
-
-               case 'r':       /* replica demotion */
-                       replica_demotion = 1;           
+               case 'q':       /* turn on quick */
+                       mode |= SLAP_TOOL_QUICK;
                        break;
 
                case 'R':
@@ -266,13 +233,8 @@ slap_tool_init(
                        verbose++;
                        break;
 
-               case 'W':       /* write context csn on every entry add */
-                       update_ctxcsn = SLAP_TOOL_CTXCSN_BATCH;
-                       /* FIXME : update_ctxcsn = SLAP_TOOL_CTXCSN_ENTRY; */
-                       break;
-
-               case 'w':       /* write context csn on at the end */
-                       update_ctxcsn = SLAP_TOOL_CTXCSN_BATCH;
+               case 'w':       /* write context csn at the end */
+                       update_ctxcsn++;
                        break;
 
                case 'X':
@@ -293,14 +255,6 @@ slap_tool_init(
                        usage( tool, progname );
                }
 
-               if ( replica_promotion && replica_demotion ) {
-                       usage( tool, progname );
-
-               } else if ( !replica_promotion && !replica_demotion ) {
-                       if ( update_ctxcsn != SLAP_TOOL_CTXCSN_KEEP ) {
-                               usage( tool, progname );
-                       }
-               }
                break;
 
        case SLAPDN:
@@ -387,6 +341,7 @@ slap_tool_init(
                exit( EXIT_FAILURE );
        }
 
+       at_oc_cache = 1;
        ldap_syslog = 0;
 
        switch ( tool ) {
@@ -531,7 +486,19 @@ startup:;
 #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 );
        }
 }