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 6045fa9bfec8d689a7a0ee3c077c58e947a01317..1f49f18b3ba59193abef54dff35b3c7f1812bf9c 100644 (file)
--- 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 267823b73cae2788ed08334fc7f685fc2fc8bb36..8667d72c528d0dae3698d32cd25810ccddabade1 100644 (file)
--- 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 11b5f0733da311c189b658a30568597561ca5117..d1be21a9834db78509dcfef17773b4b6f01a5d19 100644 (file)
--- 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;