Don't automatically index objectlclass eq, ineffective more than not

diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index 850c4650cf9576ff76ad69679bc24071dd9acc17..16138f97bafbb771bd1b6572166df7bbebb92cae 100644 (file)
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -80,8 +80,7 @@ attr_index_config(
     const char         *fname,
     int                        lineno,
     int                        argc,
-    char               **argv,
-       int init )
+    char               **argv )
 {
        int rc;
        int     i;
@@ -223,7 +222,7 @@ attr_index_config(
                rc = avl_insert( &li->li_attrs, (caddr_t) a,
                        (AVL_CMP) ainfo_cmp, (AVL_DUP) avl_dup_error );
 
-               if( rc && !init ) {
+               if( rc ) {
                        fprintf( stderr, "%s: line %d: duplicate index definition "
                                "for attr \"%s\" (ignored)\n",
                            fname, lineno, attrs[i] );

diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 352bc91561781002b572bfe0831ae64eb20b41a8..a6c3e15a5b189af9be5a66d597e9b57fc2d361d1 100644 (file)
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -68,7 +68,7 @@ ldbm_back_db_config(
 "%s: line %d: extra junk after \"index <attr> [pres,eq,approx,sub]\" line (ignored)\n",
                            fname, lineno );
                }
-               rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1], 0 );
+               rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1] );
 
                if( rc != LDAP_SUCCESS ) return 1;
 

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 9ed26adf967a7e0e574ade3e032fc23a41938c46..bf543aeec4efb4b6e9718ef587feebb9ffd384eb 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -176,17 +176,6 @@ ldbm_back_db_open(
     BackendDB  *be
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       char            *argv[ 4 ];
-
-       /* allocate backend-database-specific stuff */
-
-       argv[ 0 ] = "objectclass";
-       argv[ 1 ] = "eq";
-       argv[ 2 ] = NULL;
-       attr_index_config( li, "ldbm objectclass initialization",
-               0, 2, argv, 1 );
-
        return 0;
 }