upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-14 19:04:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix backend config table fallthru

Browse source
This commit is contained in:
Howard Chu 2005-03-04 10:01:31 +00:00
parent 0b9ffad770
commit 50c3487e03
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
servers/slapd/config.c
View file

@ -468,32 +468,29 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
}
}
} else if ( c->be && c->be->be_cf_table ) {
rc = parse_config_table( c->be->be_cf_table, c );
} else if ( c->be ) {
if ( c->be->be_cf_table ) {
rc = parse_config_table( c->be->be_cf_table, c );
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend database definition (ignored)\n",
c->log, *c->argv, 0);
continue;
default:
goto badline;
}
if ( !rc ) continue;
if ( rc != ARG_UNKNOWN ) goto badline;
}
} else if ( c->be && c->be->be_config ) {
rc = (*c->be->be_config)(c->be, c->fname, c->lineno, c->argc, c->argv);
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend database definition (ignored)\n",
c->log, *c->argv, 0);
continue;
default:
goto badline;
if ( c->be->be_config ) {
rc = (*c->be->be_config)(c->be, c->fname, c->lineno,
c->argc, c->argv);
if ( rc ) {
switch(rc) {
case SLAP_CONF_UNKNOWN:
Debug( LDAP_DEBUG_CONFIG, "%s: "
"unknown directive <%s> inside backend database "
"definition (ignored)\n",
c->log, *c->argv, 0);
continue;
default:
goto badline;
}
}
}