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

Minor adjustments to last commit

Browse source
This commit is contained in:
Kurt Zeilenga 2000-06-15 22:53:18 +00:00
parent 90e4c08751
commit 5ab454ac77
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/attr.c
View file

@ -109,9 +109,9 @@ Attribute *attrs_dup( Attribute *a )
int
attr_merge(
Entry *e,
Entry *e,
AttributeDescription *desc,
struct berval **vals )
struct berval **vals )
{
Attribute **a;

10
servers/slapd/back-ldbm/modify.c
View file

@ -275,9 +275,9 @@ add_values(
/* check if the values we're adding already exist */
if ( a != NULL ) {
/* do allow add of additional attribute if
no equality rule exists */
if( mr == NULL ) {
if( mr == NULL || !mr->smr_match ) {
/* do not allow add of additional attribute
if no equality rule exists */
return LDAP_INAPPROPRIATE_MATCHING;
}
@ -339,9 +339,9 @@ delete_values(
LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS );
}
/* disallow specific attributes from being deleted if
no equality rule */
if( mr == NULL || !mr->smr_match ) {
/* disallow specific attributes from being deleted if
no equality rule */
return LDAP_INAPPROPRIATE_MATCHING;
}