From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 3 Apr 2004 12:20:22 +0000 (+0000)
Subject: return error code only if required (ITS#3042)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_9~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=97a2a26bb6276912e9f20c8967d0dcd1289c5cdf;p=openldap

return error code only if required (ITS#3042)
---

diff --git a/CHANGES b/CHANGES
index 70760ba9d0..7b0dc18aca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.9 Engineering
+	Fixed back-meta compare return code (ITS#3042)
 	Build Environment
 		Fixed slapd dynamic backend build (ITS#3044)
 
diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 4f0d06548f..30314eb9f6 100644
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -258,7 +258,9 @@ finish:;
 		ldap_back_dn_massage( &dc, &matched, &mmatch );
 	}
 
-	rs->sr_err = rres;
+	if ( rres != LDAP_SUCCESS ) {
+		rs->sr_err = rres;
+	}
 	rs->sr_matched = mmatch.bv_val;
 	send_ldap_result( op, rs );
 	rs->sr_matched = NULL;