upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-25 00:02:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9758 Make sure we don't end up with duplicates in entry

Browse source
This commit is contained in:
Ondřej Kuzník 2021-12-06 15:58:54 +00:00 committed by Quanah Gibson-Mount
parent da73c184b2
commit 3d908bcd89
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/back-sock/config.c
View file

@ -214,6 +214,10 @@ bs_cf_gen( ConfigArgs *c )
if ( verbs_to_mask( c->argc, c->argv, bs_exts, &adds ) ) {
return LDAP_INVALID_SYNTAX;
}
/* Tolerate overlaps in slapd.conf */
if ( c->op != SLAP_CONFIG_ADD && adds & si->si_extensions ) {
return LDAP_TYPE_OR_VALUE_EXISTS;
}
si->si_extensions |= adds;
return 0;
}
@ -222,6 +226,10 @@ bs_cf_gen( ConfigArgs *c )
if ( verbs_to_mask( c->argc, c->argv, ov_ops, &adds ) ) {
return LDAP_INVALID_SYNTAX;
}
/* Tolerate overlaps in slapd.conf */
if ( c->op != SLAP_CONFIG_ADD && adds & si->si_ops ) {
return LDAP_TYPE_OR_VALUE_EXISTS;
}
si->si_ops |= adds;
return 0;
}
@ -230,6 +238,10 @@ bs_cf_gen( ConfigArgs *c )
if ( verbs_to_mask( c->argc, c->argv, ov_resps, &adds ) ) {
return LDAP_INVALID_SYNTAX;
}
/* Tolerate overlaps in slapd.conf */
if ( c->op != SLAP_CONFIG_ADD && adds & si->si_resps ) {
return LDAP_TYPE_OR_VALUE_EXISTS;
}
si->si_resps |= adds;
return 0;
}