Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-mdb / compare.c

diff --git a/servers/slapd/back-mdb/compare.c b/servers/slapd/back-mdb/compare.c
index 9bb05dc53c424d95adb2d24784ea277845d35ca5..26eafbe00d39e08f1628e12ee07f97246bf215bd 100644 (file)
--- a/servers/slapd/back-mdb/compare.c
+++ b/servers/slapd/back-mdb/compare.c
@@ -29,7 +29,7 @@ mdb_compare( Operation *op, SlapReply *rs )
        int             manageDSAit = get_manageDSAit( op );
 
        MDB_txn         *rtxn;
-       mdb_op_info     opinfo = {0}, *moi = &opinfo;
+       mdb_op_info     opinfo = {{{0}}}, *moi = &opinfo;
 
        rs->sr_err = mdb_opinfo_get(op, mdb, 1, &moi);
        switch(rs->sr_err) {
@@ -43,7 +43,7 @@ mdb_compare( Operation *op, SlapReply *rs )
        rtxn = moi->moi_txn;
 
        /* get entry */
-       rs->sr_err = mdb_dn2entry( op, rtxn, &op->o_req_ndn, &e, 1 );
+       rs->sr_err = mdb_dn2entry( op, rtxn, NULL, &op->o_req_ndn, &e, 1 );
        switch( rs->sr_err ) {
        case MDB_NOTFOUND:
        case 0:
@@ -77,7 +77,7 @@ mdb_compare( Operation *op, SlapReply *rs )
                                }
                                rs->sr_err = LDAP_REFERRAL;
                        }
-                       mdb_entry_return( e );
+                       mdb_entry_return( op, e );
                        e = NULL;
 
                } else {
@@ -133,7 +133,7 @@ done:
        }
        /* free entry */
        if ( e != NULL ) {
-               mdb_entry_return( e );
+               mdb_entry_return( op, e );
        }
 
        return rs->sr_err;