From: Pierangelo Masarati <ando@openldap.org>
Date: Sun, 18 Jul 2004 22:23:44 +0000 (+0000)
Subject: import fix to ITS#3247 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_15~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74d1d99d77ef835277889c5fc3773ed9455188da;p=openldap

import fix to ITS#3247 from HEAD
---

diff --git a/CHANGES b/CHANGES
index 247fbc61e1..e53a76b5d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ OpenLDAP 2.2.15 Engineering
 	Fixed slapd abandon/cancel pending bug
 	Fixed slapd attribute description syntax bug
 	Fixed slapd ACI caching bug (caching disabled, ITS#3215)
+	Fixed slapd uniqueMemberMatch empty DN portion bug (ITS#3247)
 	Fixed slapadd dryrun mode (ITS#3244)
 	Fixed libldap SASL re-encode bug
 	Fixed libldap sasl_encode 64-bit bug (ITS#3054,3212)
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index b28477384c..a6fc797bf5 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1093,14 +1093,12 @@ uniqueMemberMatch(
 {
 	int match;
 	struct berval *asserted = (struct berval *) assertedValue;
-	struct berval assertedDN = BER_BVNULL;
+	struct berval assertedDN = *asserted;
 	struct berval assertedUID = BER_BVNULL;
 	struct berval valueDN = BER_BVNULL;
 	struct berval valueUID = BER_BVNULL;
 
-	if( !BER_BVISEMPTY( asserted ) ) {
-		assertedDN = *asserted;
-
+	if ( !BER_BVISEMPTY( asserted ) ) {
 		assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' );
 		if ( !BER_BVISNULL( &assertedUID ) ) {
 			assertedUID.bv_val++;