From 88db86e9cc219c9cea12e5fa7b138861300762d9 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 28 May 2008 18:28:18 +0000
Subject: [PATCH] ITS#5461
---
CHANGES | 3 ++-
servers/slapd/result.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2a8e3c4d3b..e53b128f8c 100644
--- 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 f81ca9f482..8b623bbaba 100644
--- 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;
--
GitLab