Partial revert from 1.246, not sure what's the point

[openldap] / servers / slapd / slapindex.c

diff --git a/servers/slapd/slapindex.c b/servers/slapd/slapindex.c
index 21734f1e116dadcd9c863033a419e2f3899009d1..4f8e326b55d2ea425f6a239c3189e52b792626b3 100644 (file)
--- a/servers/slapd/slapindex.c
+++ b/servers/slapd/slapindex.c
@@ -37,6 +37,7 @@ slapindex( int argc, char **argv )
        ID id;
        int rc = EXIT_SUCCESS;
        const char *progname = "slapindex";
+       AttributeDescription *ad, **adv = NULL;
 
        slap_tool_init( progname, SLAPINDEX, argc, argv );
 
@@ -51,12 +52,32 @@ slapindex( int argc, char **argv )
                exit( EXIT_FAILURE );
        }
 
+       argc -= optind;
+       if ( argc > 0 ) {
+               const char *text;
+               int i;
+
+               argv = &argv[optind];
+               adv = (AttributeDescription **)argv;
+
+               for (i = 0; i < argc; i++ ) {
+                       ad = NULL;
+                       rc = slap_str2ad( argv[i], &ad, &text );
+                       if ( rc != LDAP_SUCCESS ) {
+                               fprintf( stderr, "slap_str2ad(%s) failed %d (%s)\n",
+                                       argv[i], rc, ldap_err2string( rc ));
+                               exit( EXIT_FAILURE );
+                       }
+                       adv[i] = ad;
+               }
+       }
+
        if( be->be_entry_open( be, 0 ) != 0 ) {
                fprintf( stderr, "%s: could not open database.\n",
                        progname );
                exit( EXIT_FAILURE );
        }
-
+       
        for ( id = be->be_entry_first( be );
                id != NOID;
                id = be->be_entry_next( be ) )
@@ -67,7 +88,7 @@ slapindex( int argc, char **argv )
                        printf("indexing id=%08lx\n", (long) id );
                }
 
-               rtn =  be->be_entry_reindex( be, id );
+               rtn =  be->be_entry_reindex( be, id, adv );
 
                if( rtn != LDAP_SUCCESS ) {
                        rc = EXIT_FAILURE;