From: Howard Chu <hyc@openldap.org>
Date: Mon, 14 Jan 2002 20:13:25 +0000 (+0000)
Subject: Revert previous commit
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~134
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11802791040bd26db101ac5486dafa56bfd3877e;p=openldap

Revert previous commit
---

diff --git a/servers/slapd/index.c b/servers/slapd/index.c
index 6d68292906..786ccb388a 100644
--- a/servers/slapd/index.c
+++ b/servers/slapd/index.c
@@ -56,6 +56,8 @@ 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 cda6b28613..68f8606419 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -196,6 +196,7 @@ 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