X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Findex.c;h=a3b1032f5c6ce03de047c867350c0d36e5b0437f;hb=fd810bb35ebcae78d9e9393af51873f1b404ee02;hp=153cff79a8ecf7d208a5bf9b95a7b083aa5c209d;hpb=ea069cb7c2731d54d20d41cd49936914ab78edb3;p=openldap

diff --git a/servers/slapd/index.c b/servers/slapd/index.c
index 153cff79a8..a3b1032f5c 100644
--- a/servers/slapd/index.c
+++ b/servers/slapd/index.c
@@ -1,7 +1,7 @@
 /* index.c - index utilities */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -11,30 +11,7 @@
 
 #include "slap.h"
 
-int
-slap_index2prefix( int indextype )
-{
-	int	prefix;
-
-	switch ( indextype ) {
-	case SLAP_INDEX_EQUALITY:
-		prefix = SLAP_INDEX_EQUALITY_PREFIX;
-		break;
-	case SLAP_INDEX_APPROX:
-		prefix = SLAP_INDEX_APPROX_PREFIX;
-		break;
-	case SLAP_INDEX_SUBSTR:
-		prefix = SLAP_INDEX_SUBSTR_PREFIX;
-		break;
-	default:
-		prefix = SLAP_INDEX_UNKNOWN_PREFIX;
-		break;
-	}
-
-	return( prefix );
-}
-
-int slap_str2index( const char *str, slap_index *idx )
+int slap_str2index( const char *str, slap_mask_t *idx )
 {
 	if ( strcasecmp( str, "pres" ) == 0 ) {
 		*idx = SLAP_INDEX_PRESENT;
@@ -52,14 +29,10 @@ int slap_str2index( const char *str, slap_index *idx )
 		strcasecmp( str, "sub" ) == 0 )
 	{
 		*idx = SLAP_INDEX_SUBSTR_DEFAULT;
-	} else if ( strcasecmp( str, "lang" ) == 0 ) {
-		*idx = SLAP_INDEX_LANG;
-	} else if ( strcasecmp( str, "autolang" ) == 0 ) {
-		*idx = SLAP_INDEX_AUTO_LANG;
-	} else if ( strcasecmp( str, "subtypes" ) == 0 ) {
-		*idx = SLAP_INDEX_SUBTYPES;
-	} else if ( strcasecmp( str, "autosubtypes" ) == 0 ) {
-		*idx = SLAP_INDEX_AUTO_SUBTYPES;
+	} else if ( strcasecmp( str, "nolang" ) == 0 ) {
+		*idx = SLAP_INDEX_NOLANG;
+	} else if ( strcasecmp( str, "nosubtypes" ) == 0 ) {
+		*idx = SLAP_INDEX_NOSUBTYPES;
 	} else {
 		return LDAP_OTHER;
 	}