From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 6 Jun 2000 19:30:49 +0000 (+0000)
Subject: Don't automatically index objectlclass eq, ineffective more than not
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2737
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=352b447aa4b3c4108c3335aa429e67d153a90d64;p=openldap

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 850c4650cf..16138f97ba 100644
--- 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 352bc91561..a6c3e15a5b 100644
--- 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 9ed26adf96..bf543aeec4 100644
--- 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;
 }