Revert previous commit again. autosubtypes are gone for good.

diff --git a/servers/slapd/index.c b/servers/slapd/index.c
index 786ccb388a1fa7b66420e58633ad7745253918b1..6d68292906e29bb4a6d02f2bef8dd0cd985cc907 100644 (file)
--- a/servers/slapd/index.c
+++ b/servers/slapd/index.c
@@ -56,8 +56,6 @@ int slap_str2index( const char *str, slap_mask_t *idx )
                *idx = SLAP_INDEX_NOLANG;
        } else if ( strcasecmp( str, "nosubtypes" ) == 0 ) {
                *idx = SLAP_INDEX_NOSUBTYPES;
-       } else if ( strcasecmp( str, "autosubtypes" ) == 0 ) {
-               *idx = SLAP_INDEX_AUTO_SUBTYPES;
        } else {
                return LDAP_OTHER;
        }

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 68f86064198d26a776c4312ac5a0cc1d23f50b09..cda6b28613db2bad9fd74914f2b427d7797f9e1b 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -196,7 +196,6 @@ typedef struct slap_ssf_set {
 #define SLAP_INDEX_FLAGS         0xF000UL
 #define SLAP_INDEX_NOSUBTYPES    0x1000UL /* don't use index w/ subtypes */
 #define SLAP_INDEX_NOLANG        0x2000UL /* don't use index w/ lang */
-#define SLAP_INDEX_AUTO_SUBTYPES 0x4000UL /* use mask with lang subtypes */
 
 /*
  * there is a single index for each attribute.  these prefixes ensure