ITS#5461

diff --git a/CHANGES b/CHANGES
index 2a8e3c4d3bd06707dd14388042b8abdf7998f381..e53b128f8c5a84449fc498718badad5136d2bedc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,11 @@ OpenLDAP 2.4.10 Engineering
        Fixed libldap ld_defconn cleanup if it was freed (ITS#5518, ITS#5525)
        Fixed libldap msgid handling (ITS#5318)
        Fixed libldap_r missing stubs (ITS#5519)
+       Fixed slapd initialization of sr_msgid, rs->sr_tag (ITS#5461)
        Fixed slapd missing termination of integerFilter keys (ITS#5503)
        Fixed slapd multiple attrs in URI (ITS#5516)
-       Fixed slapd socket assert (ITS#5489)
        Fixed slapd sasl_ssf retrieval (ITS#5403)
+       Fixed slapd socket assert (ITS#5489)
        Fixed slapd-bdb/hdb MAXPATHLEN (ITS#5531)
        Fixed slapd-bdb indexing in single ADD/MOD (ITS#5521)
        Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f81ca9f4824c375c00235409d743a4bbcb1e11f8..8b623bbaba50a320a7bf80568f09f42b98c03218 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -627,10 +627,10 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
                rs->sr_ref = NULL;
        }
 
+abandon:
        rs->sr_tag = slap_req2res( op->o_tag );
        rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-abandon:
        if ( rs->sr_flags & REP_REF_MUSTBEFREED ) {
                if ( rs->sr_ref == NULL ) {
                        rs->sr_flags ^= REP_REF_MUSTBEFREED;