From 194aa68dab3f346ed8453794c1555f3e6dcd6369 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 24 Nov 2005 21:20:06 +0000 Subject: [PATCH] always set sr_flags before sending an entry --- servers/slapd/back-sql/search.c | 4 +--- servers/slapd/bconfig.c | 1 + servers/slapd/search.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) 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; -- 2.39.5