/* index.c - routines for dealing with attribute indexes */
+#include "portable.h"
+
#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
-#include "back-ldbm.h"
-extern char *first_word();
-extern char *next_word();
-extern char *phonetic();
-extern IDList *idl_fetch();
-extern IDList *idl_allids();
-extern struct dbcache *ldbm_cache_open();
+#include <ac/string.h>
+#include <ac/socket.h>
-int index_add_values();
+#include "slap.h"
+#include "back-ldbm.h"
-static int add_value();
-static int index2prefix();
+static int add_value(Backend *be, struct dbcache *db, char *type, int indextype, char *val, ID id);
+static int index2prefix(int indextype);
int
index_add_entry(
* with index_add_values() call
*/
- bv.bv_val = strdup( e->e_dn );
+ bv.bv_val = ch_strdup( e->e_dn );
bv.bv_len = strlen( bv.bv_val );
(void) dn_normalize_case( bv.bv_val );
bvals[0] = &bv;
int
index_add_mods(
Backend *be,
- LDAPMod *mods,
+ LDAPModList *ml,
ID id
)
{
int rc;
- for ( ; mods != NULL; mods = mods->mod_next ) {
- switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+ for ( ; ml != NULL; ml = ml->ml_next ) {
+ LDAPMod *mod = &ml->ml_mod;
+
+ switch ( mod->mod_op & ~LDAP_MOD_BVALUES ) {
case LDAP_MOD_ADD:
case LDAP_MOD_REPLACE:
- rc = index_add_values( be, mods->mod_type,
- mods->mod_bvalues, id );
+ rc = index_add_values( be, mod->mod_type,
+ mod->mod_bvalues, id );
break;
case LDAP_MOD_DELETE:
char *realval, *tmpval;
char buf[BUFSIZ];
-#ifdef LDBM_USE_DB2
+#ifdef HAVE_BERKELEY_DB2
memset( &key, 0, sizeof( key ) );
#endif
if ( ! (indextype & indexmask) ) {
idl = idl_allids( be );
Debug( LDAP_DEBUG_TRACE,
- "<= index_read %d candidates (allids - not indexed)\n",
+ "<= index_read %lu candidates (allids - not indexed)\n",
idl ? idl->b_nids : 0, 0, 0 );
return( idl );
}
realval = val;
tmpval = NULL;
if ( prefix != '\0' ) {
- int len = strlen( val );
+ unsigned int len = strlen( val );
if ( (len + 2) < sizeof(buf) ) {
realval = buf;
ldbm_cache_close( be, db );
- Debug( LDAP_DEBUG_TRACE, "<= index_read %d candidates\n",
+ Debug( LDAP_DEBUG_TRACE, "<= index_read %lu candidates\n",
idl ? idl->b_nids : 0, 0, 0 );
return( idl );
}
char *realval, *tmpval, *s;
char buf[BUFSIZ];
-#ifdef LDBM_USE_DB2
+#ifdef HAVE_BERKELEY_DB2
memset( &key, 0, sizeof( key ) );
#endif
tmpval = NULL;
idl = NULL;
if ( prefix != '\0' ) {
- int len = strlen( val );
+ unsigned int len = strlen( val );
if ( (len + 2) < sizeof(buf) ) {
realval = buf;
)
{
char *val, *p, *code, *w;
- int i, j, len;
+ unsigned i, j, len;
int indexmask, syntax;
char buf[SUBLEN + 1];
char vbuf[BUFSIZ];