From 7ff822a07c3a1e200b8d04adc45858d7eb5090cc Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 4 Jan 2011 21:54:43 +0000 Subject: [PATCH] ITS#6774 --- CHANGES | 1 + servers/slapd/back-meta/search.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ad3c378a2e..f921e93e06 100644 --- 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 6f01dbefd9..242fc623fa 100644 --- 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; -- 2.39.5