ITS#6774

diff --git a/CHANGES b/CHANGES
index ad3c378a2e18e79b46076c5d4cf3c76eacf25d6b..f921e93e06267000c912ed5fb4e261dcf5839482 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapd-meta rebind proc (ITS#6665)
        Fixed slapd-meta to correctly rebind as user (ITS#6574)
        Fixed slapd-meta with SASL/EXTERNAL (ITS#6642)
+       Fixed slapd-meta matchedDN return code (ITS#6774)
        Fixed slapd-monitor hasSubordinates generation (ITS#6712)
        Fixed slapd-sql with null objectClass (ITS#6616)
        Fixed slapd-sql hasSubordinates generation (ITS#6712)

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 6f01dbefd9176e2942840943e2bac37eb060581f..242fc623faca9dbd21df8dc338600b108a32495f 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -1916,7 +1916,7 @@ free_message:;
        }
 
        rs->sr_err = sres;
-       rs->sr_matched = matched;
+       rs->sr_matched = ( sres == LDAP_SUCCESS ? NULL : matched );
        rs->sr_ref = ( sres == LDAP_REFERRAL ? rs->sr_v2ref : NULL );
        send_ldap_result( op, rs );
        op->o_private = savepriv;