mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4337 allow suffix overlap when inserting new DB before existing ones

Browse Source
This commit is contained in:
Howard Chu 2006-12-24 01:27:35 +00:00
parent 6020a6d81d
commit 36317874b7
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
servers/slapd/bconfig.c
View File

@ -2091,22 +2091,30 @@ config_suffix(ConfigArgs *c)
free(pdn.bv_val);
free(ndn.bv_val);
} else if(tbe) {
char *type = tbe->bd_info->bi_type;
BackendDB *b2 = tbe;
if ( overlay_is_over( tbe ) ) {
slap_overinfo *oi = (slap_overinfo *)tbe->bd_info->bi_private;
type = oi->oi_orig->bi_type;
/* Does tbe precede be? */
while (( b2 = LDAP_STAILQ_NEXT(b2, be_next )) && b2 && b2 != c->be );
if ( b2 ) {
char *type = tbe->bd_info->bi_type;
if ( overlay_is_over( tbe ) ) {
slap_overinfo *oi = (slap_overinfo *)tbe->bd_info->bi_private;
type = oi->oi_orig->bi_type;
}
snprintf( c->msg, sizeof( c->msg ), "<%s> namingContext \"%s\" "
"already served by a preceding %s database",
c->argv[0], pdn.bv_val, type );
Debug(LDAP_DEBUG_ANY, "%s: %s serving namingContext \"%s\"\n",
c->log, c->msg, tbe->be_suffix[0].bv_val);
free(pdn.bv_val);
free(ndn.bv_val);
return(1);
}
snprintf( c->msg, sizeof( c->msg ), "<%s> namingContext \"%s\" already served by "
"a preceding %s database serving namingContext",
c->argv[0], pdn.bv_val, type );
Debug(LDAP_DEBUG_ANY, "%s: %s \"%s\"\n",
c->log, c->msg, tbe->be_suffix[0].bv_val);
free(pdn.bv_val);
free(ndn.bv_val);
return(1);
} else if(pdn.bv_len == 0 && default_search_nbase.bv_len) {
}
if(pdn.bv_len == 0 && default_search_nbase.bv_len) {
Debug(LDAP_DEBUG_ANY, "%s: suffix DN empty and default search "
"base provided \"%s\" (assuming okay)\n",
c->log, default_search_base.bv_val, 0);