return error code only if required (ITS#3042)

diff --git a/CHANGES b/CHANGES
index 70760ba9d0b6c6aae9378a2d8bf6da1436d332ef..7b0dc18aca5022a70096158687e4de7e5247a3d1 100644 (file)
--- 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 4f0d06548f7d9ee3e28280817c0f5a4d6dd35905..30314eb9f672435ea5ae9adf69ae8f066def5ad5 100644 (file)
--- 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;