upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 18:19:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

For ITS#9309 fix check for duplicate overlays

Browse source 
and pass error message back to frontend
This commit is contained in:
Howard Chu 2020-08-10 16:40:54 +01:00
parent c8c39b8468
commit 633d40b0ac
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/backover.c
View file

@ -1355,16 +1355,16 @@ overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res, Confi
if ( be->bd_info == frontendDB->bd_info || SLAP_ISGLOBALOVERLAY( be ) ) {
isglobal = 1;
if ( on->on_bi.bi_flags & SLAPO_BFLAG_DBONLY ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" cannot be global.\n",
ov );
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" cannot be global.", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
} else if ( on->on_bi.bi_flags & SLAPO_BFLAG_GLOBONLY ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" can only be global.\n",
ov );
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" can only be global.", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
@ -1427,10 +1427,10 @@ overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res, Confi
} else {
if ( overlay_is_inst( be, ov ) ) {
if ( SLAPO_SINGLE( be ) ) {
Debug( LDAP_DEBUG_ANY, "overlay_config(): "
"overlay \"%s\" already in list\n",
ov );
if ( on->on_bi.bi_flags & SLAPO_BFLAG_SINGLE ) {
snprintf( cr->msg, sizeof( cr->msg ), "overlay_config(): "
"overlay \"%s\" already in list", ov );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
return 1;
}
}