From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 24 Nov 2005 21:20:06 +0000 (+0000)
Subject: always set sr_flags before sending an entry
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~710
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=194aa68dab3f346ed8453794c1555f3e6dcd6369;p=openldap

always set sr_flags before sending an entry
---

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 6045fa9bfe..1f49f18b3b 100644
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -2328,9 +2328,7 @@ backsql_search( Operation *op, SlapReply *rs )
 			rs->sr_attrs = op->ors_attrs;
 			rs->sr_operational_attrs = NULL;
 			rs->sr_entry = e;
-			if ( e == &user_entry ) {
-				rs->sr_flags = REP_ENTRY_MODIFIABLE;
-			}
+			rs->sr_flags = ( e == &user_entry ) ? REP_ENTRY_MODIFIABLE : 0;
 			/* FIXME: need the whole entry (ITS#3480) */
 			sres = send_search_entry( op, rs );
 			rs->sr_entry = NULL;
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 267823b73c..8667d72c52 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -3028,6 +3028,7 @@ config_send( Operation *op, SlapReply *rs, CfEntryInfo *ce, int depth )
 	{
 		rs->sr_attrs = op->ors_attrs;
 		rs->sr_entry = ce->ce_entry;
+		rs->sr_flags = 0;
 		rc = send_search_entry( op, rs );
 	}
 	if ( op->ors_scope == LDAP_SCOPE_SUBTREE ) {
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 11b5f0733d..d1be21a983 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -286,6 +286,7 @@ fe_op_search( Operation *op, SlapReply *rs )
 				rs->sr_entry = entry;
 				rs->sr_attrs = op->ors_attrs;
 				rs->sr_operational_attrs = NULL;
+				rs->sr_flags = 0;
 				send_search_entry( op, rs );
 				rs->sr_entry = NULL;
 				rs->sr_operational_attrs = NULL;