From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 15 Jun 2000 22:53:18 +0000 (+0000)
Subject: Minor adjustments to last commit
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2628
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5ab454ac774d9f6a3b3de4b95ce10b332b040400;p=openldap

Minor adjustments to last commit
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index f4aa43308d..9239e161f8 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -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;
 
diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 86a1bbd41d..bf5ebd4409 100644
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -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;
 	}