mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

first part of fix to ITS#4262

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-12-15 23:46:23 +00:00
parent f0961f0afd
commit e788a5c380
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
servers/slapd/back-bdb/config.c
View File

@ -464,26 +464,52 @@ bdb_cf_gen(ConfigArgs *c)
case BDB_NOSYNC:
bdb->bi_dbenv->set_flags( bdb->bi_dbenv, DB_TXN_NOSYNC, 0 );
break;
case BDB_INDEX: {
AttributeDescription *ad = NULL;
struct berval bv, def = BER_BVC("default");
char *ptr;
const char *text;
for (ptr = c->line; !isspace( *ptr ); ptr++);
bv.bv_val = c->line;
bv.bv_len = ptr - bv.bv_val;
if ( bvmatch( &bv, &def )) {
bdb->bi_defaultmask = 0;
case BDB_INDEX:
if ( c->valx == -1 ) {
/* delete all (FIXME) */
} else {
slap_bv2ad( &bv, &ad, &text );
if ( ad ) {
AttrInfo *ai = bdb_attr_mask( bdb, ad );
ai->ai_indexmask |= BDB_INDEX_DELETING;
bdb->bi_flags |= BDB_DEL_INDEX;
c->cleanup = bdb_cf_cleanup;
struct berval bv, def = BER_BVC("default");
char *ptr;
for (ptr = c->line; !isspace( *ptr ); ptr++);
bv.bv_val = c->line;
bv.bv_len = ptr - bv.bv_val;
if ( bvmatch( &bv, &def )) {
bdb->bi_defaultmask = 0;
} else {
int i;
char **attrs;
char sep;
sep = bv.bv_val[ bv.bv_len ];
bv.bv_val[ bv.bv_len ] = '\0';
attrs = ldap_str2charray( bv.bv_val, "," );
for ( i = 0; attrs[ i ]; i++ ) {
AttributeDescription *ad = NULL;
const char *text;
AttrInfo *ai;
slap_str2ad( attrs[ i ], &ad, &text );
/* if we got here... */
assert( ad != NULL );
ai = bdb_attr_mask( bdb, ad );
/* if we got here... */
assert( ai != NULL );
ai->ai_indexmask |= BDB_INDEX_DELETING;
bdb->bi_flags |= BDB_DEL_INDEX;
c->cleanup = bdb_cf_cleanup;
}
bv.bv_val[ bv.bv_len ] = sep;
ldap_charray_free( attrs );
}
}
}
break;
}
return rc;

1
servers/slapd/config.c
View File

@ -628,6 +628,7 @@ config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
}
rc = config_check_vals( ct, c, 1 );
ch_free( c->tline );
c->tline = NULL;
if ( rc )
rc = LDAP_CONSTRAINT_VIOLATION;