Don't create a subtree dn index.

diff --git a/CHANGES b/CHANGES
index de50c30f5a5e0bea414a9519966fb330f0fa86a3..e093ac9bd3ca3c2910af405644268d696f59512c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ Changes included in OpenLDAP 1.2 Release Engineering
        Added TCP_NODELAY support
        Change slapd to apply ACL to lastmod attributes
        Change slapd.conf default referral
+       Disable DN subtree indexing
        Build Environment
                Support using short as LDAP_INT4
        Documentation

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 36ae9daa8ff9d54473895f584b8c361b87f0292f..79d8ca62299aaea8a7efb47e58031b8196bb4582 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -54,8 +54,16 @@ ldbm_back_init(
        argv[ 2 ] = NULL;
        attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
        argv[ 0 ] = "dn";
+#ifdef SLAPD_DN_SUBSTRING_INDEX
+       /*
+        * this is generally too expensive on larger servers and not
+        * effective on small servers.
+        */
        argv[ 1 ] = ch_strdup( "sub,eq" );
-       argv[ 3 ] = NULL;
+#else
+       argv[ 1 ] = ch_strdup( "eq" );
+#endif
+       argv[ 2 ] = NULL;
        attr_index_config( li, "ldbm dn initialization", 0, 2, argv, 1 );
        free( argv[ 1 ] );
        argv[ 0 ] = "id2children";
@@ -64,7 +72,7 @@ ldbm_back_init(
        attr_index_config( li, "ldbm id2children initialization", 0, 2, argv,
            1 );
        argv[ 0 ] = "objectclass";
-       argv[ 1 ] = ch_strdup( "pres,eq" );
+       argv[ 1 ] = ch_strdup( "eq" );
        argv[ 2 ] = NULL;
        attr_index_config( li, "ldbm objectclass initialization", 0, 2, argv,
            1 );