import fix to ITS#3247 from HEAD

diff --git a/CHANGES b/CHANGES
index 247fbc61e17e7774dca2d6b242058588016e8211..e53a76b5d53c936a0a0b2aee41394074c291fba2 100644 (file)
--- 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 b28477384c234cbab6c72400b32ca0d1950dd8a0..a6fc797bf579969868d6539002450d8ad101ca76 100644 (file)
--- 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++;