X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fattr.c;h=07bfc92cabec4f606fb32f8d4c53b8e3466a4c4e;hb=23efa07a994c94c4e78a9495ac6e2981b87b4ba0;hp=f8ff4a59cc115f71f5a6cc0f751f2ed3249ecfcf;hpb=d5d801d1528935c3a2634544a48d2429d3f163b0;p=openldap

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index f8ff4a59cc..07bfc92cab 100644
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -1,7 +1,7 @@
 /* attr.c - backend routines for dealing with attributes */
 /* $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
  */
 
@@ -67,7 +67,7 @@ bdb_attr_index_config(
 	char **attrs;
 	char **indexes = NULL;
 
-	attrs = str2charray( argv[0], "," );
+	attrs = ldap_str2charray( argv[0], "," );
 
 	if( attrs == NULL ) {
 		fprintf( stderr, "%s: line %d: "
@@ -77,7 +77,7 @@ bdb_attr_index_config(
 	}
 
 	if ( argc > 1 ) {
-		indexes = str2charray( argv[1], "," );
+		indexes = ldap_str2charray( argv[1], "," );
 
 		if( indexes == NULL ) {
 			fprintf( stderr, "%s: line %d: "
@@ -181,11 +181,11 @@ bdb_attr_index_config(
 		}
 
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			"attr_index_config: index %s 0x%04x\n",
-			ad->ad_cname.bv_val, mask ));
+		LDAP_LOG( BACK_BDB, DETAIL1, 
+			"attr_index_config: index %s 0x%04lx\n",
+			ad->ad_cname.bv_val, mask, 0 );
 #else
-		Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04x\n",
+		Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
 			ad->ad_cname.bv_val, mask, 0 ); 
 #endif
 
@@ -205,8 +205,8 @@ bdb_attr_index_config(
 		}
 	}
 
-	charray_free( attrs );
-	if ( indexes != NULL ) charray_free( indexes );
+	ldap_charray_free( attrs );
+	if ( indexes != NULL ) ldap_charray_free( indexes );
 
 	return LDAP_SUCCESS;
 }