Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / slapindex.c

diff --git a/servers/slapd/slapindex.c b/servers/slapd/slapindex.c
index 21734f1e116dadcd9c863033a419e2f3899009d1..639859f3ad51fb60e723aa76ee247aabf79490dc 100644 (file)
--- a/servers/slapd/slapindex.c
+++ b/servers/slapd/slapindex.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -37,12 +37,13 @@ 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 );
 
        if( !be->be_entry_open ||
                !be->be_entry_close ||
-               !be->be_entry_first ||
+               !( be->be_entry_first || be->be_entry_first_x ) ||
                !be->be_entry_next  ||
                !be->be_entry_reindex )
        {
@@ -51,23 +52,48 @@ 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 ) )
-       {
+       if ( be->be_entry_first ) {
+               id = be->be_entry_first( be );
+
+       } else {
+               assert( be->be_entry_first_x != NULL );
+               id = be->be_entry_first_x( be, NULL, LDAP_SCOPE_DEFAULT, NULL );
+       }
+
+       for ( ; id != NOID; id = be->be_entry_next( be ) ) {
                int rtn;
 
                if( verbose ) {
                        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;
@@ -78,6 +104,7 @@ slapindex( int argc, char **argv )
 
        (void) be->be_entry_close( be );
 
-       slap_tool_destroy();
+       if ( slap_tool_destroy())
+               rc = EXIT_FAILURE;
        return( rc );
 }