Commit 5ab454ac authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Minor adjustments to last commit

parent 90e4c087
...@@ -109,9 +109,9 @@ Attribute *attrs_dup( Attribute *a ) ...@@ -109,9 +109,9 @@ Attribute *attrs_dup( Attribute *a )
int int
attr_merge( attr_merge(
Entry *e, Entry *e,
AttributeDescription *desc, AttributeDescription *desc,
struct berval **vals ) struct berval **vals )
{ {
Attribute **a; Attribute **a;
......
...@@ -275,9 +275,9 @@ add_values( ...@@ -275,9 +275,9 @@ add_values(
/* check if the values we're adding already exist */ /* check if the values we're adding already exist */
if ( a != NULL ) { if ( a != NULL ) {
/* do allow add of additional attribute if if( mr == NULL || !mr->smr_match ) {
no equality rule exists */ /* do not allow add of additional attribute
if( mr == NULL ) { if no equality rule exists */
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }
...@@ -339,9 +339,9 @@ delete_values( ...@@ -339,9 +339,9 @@ delete_values(
LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS ); LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS );
} }
/* disallow specific attributes from being deleted if
no equality rule */
if( mr == NULL || !mr->smr_match ) { if( mr == NULL || !mr->smr_match ) {
/* disallow specific attributes from being deleted if
no equality rule */
return LDAP_INAPPROPRIATE_MATCHING; return LDAP_INAPPROPRIATE_MATCHING;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment