reset SlapReply flags

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 999bfe0a61c3b0239ee25c6d7faffb27263535da..09954e13b323faa40a68041f0135e52e58d56b06 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -221,6 +221,7 @@ dnssrv_back_search(
                if( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
                        rs->sr_attrs = op->oq_search.rs_attrs;
+                       rs->sr_flags = REP_ENTRY_MODIFIABLE;
                        send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                        rs->sr_attrs = NULL;

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 986e4c5c7064ba6ad32493945458a76de22a939f..6cf7697fdafc54bb1bcfbcfc0c8376e0797f407a 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -187,6 +187,7 @@ fail:;
                                                LDAP_BUILD_ENTRY_PRIVATE)) == LDAP_SUCCESS ) {
                                rs->sr_entry = &ent;
                                rs->sr_attrs = op->ors_attrs;
+                               rs->sr_flags = 0;
                                abort = send_search_entry( op, rs );
                                while (ent.e_attrs) {
                                        Attribute *a;

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 2ff93defff4c4ee198f16c4a069591fc9ba3bf8f..4aaaa8a458a24129fecc6376182806e320b53be5 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -430,6 +430,7 @@ searchit:
                                }
 
                                if (e) {
+                                       rs->sr_flags = 0;
                                        result = send_search_entry( op, rs );
 
                                        switch (result) {

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index ecb5fcdafb44c6d17562d92297fba2bbd07e18e5..c4e0a2513180410e836173e2aaab2419e50e33ca 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -719,6 +719,7 @@ meta_send_entry(
        }
        rs->sr_entry = &ent;
        rs->sr_attrs = op->ors_attrs;
+       rs->sr_flags = 0;
        send_search_entry( op, rs );
        rs->sr_entry = NULL;
        rs->sr_attrs = NULL;

diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index 46fa3457118ed1ecdd6ddf5c49e9930514ed0a7f..e2d7ef63cc3847af8acc952c6e4eec068c1bf8d6 100644 (file)
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -92,6 +92,7 @@ monitor_send_children(
                rc = test_filter( op, e, op->oq_search.rs_filter );
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
+                       rs->sr_flags = 0;
                        send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                }
@@ -155,6 +156,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
                rc = test_filter( op, e, op->oq_search.rs_filter );
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
+                       rs->sr_flags = 0;
                        send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                }
@@ -175,6 +177,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
                rc = test_filter( op, e, op->oq_search.rs_filter );
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
+                       rs->sr_flags = 0;
                        send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                }

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 1932583d17a1c5d2e0a2c7785159b9bd36ea331d..3e3560e5690cdfac656f42349045e20883edb0cb 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -131,6 +131,7 @@ passwd_back_search(
                        if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
                                rs->sr_entry = e;
                                rs->sr_attrs = op->ors_attrs;
+                               rs->sr_flags = REP_ENTRY_MODIFIABLE;
                                send_search_entry( op, rs );
                        }
                }
@@ -174,6 +175,7 @@ passwd_back_search(
 
                                        rs->sr_entry = e;
                                        rs->sr_attrs = op->ors_attrs;
+                                       rs->sr_flags = REP_ENTRY_MODIFIABLE;
                                        send_search_entry( op, rs );
                                }
 
@@ -233,6 +235,7 @@ passwd_back_search(
                if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
                        rs->sr_attrs = op->ors_attrs;
+                       rs->sr_flags = REP_ENTRY_MODIFIABLE;
                        send_search_entry( op, rs );
                }
 

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index 21b9a12fd94ec39f7cd756f8aa854218fed2ec6f..4e1264e5cbf16978f3f81863bf347d698b91288e 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -100,6 +100,7 @@ perl_back_search(
                                        if (send_entry) {
                                                rs->sr_entry = e;
                                                rs->sr_attrs = op->ors_attrs;
+                                               rs->sr_flags = REP_ENTRY_MODIFIABLE;
                                                send_search_entry( op, rs );
                                        }
 

diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index 734beb3760b8f01de1e2b1669226938bed75c935..1a749eb17adecf272d5ed2226570a630dff78d90 100644 (file)
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -99,6 +99,7 @@ read_and_send_results(
                                    buf, 0, 0 );
                        } else {
                                rs->sr_attrs = op->oq_search.rs_attrs;
+                               rs->sr_flags = REP_ENTRY_MODIFIABLE;
                                send_search_entry( op, rs );
                                entry_free( rs->sr_entry );
                        }

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index efbdcd9877b047f004fb94d4c4fcd284663c575c..0eca1f703b2ede7ea8b620089a84692f1b867765 100644 (file)
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -1339,6 +1339,7 @@ backsql_search( Operation *op, SlapReply *rs )
                        {
                                rs->sr_attrs = op->ors_attrs;
                                rs->sr_entry = entry;
+                               rs->sr_flags = REP_ENTRY_MODIFIABLE;
                                sres = send_search_entry( op, rs );
                                rs->sr_entry = NULL;
                                rs->sr_attrs = NULL;

diff --git a/servers/slapd/sessionlog.c b/servers/slapd/sessionlog.c
index 5d8308a07d28a7b5468209ac5aea8fab52d85734..148f703360b271806df422c2752431d4346c2384 100644 (file)
--- a/servers/slapd/sessionlog.c
+++ b/servers/slapd/sessionlog.c
@@ -87,6 +87,7 @@ slap_send_session_log(
                        rs->sr_entry = &e;
                        rs->sr_attrs = uuid_attr;
                        rs->sr_ctrls = ctrls;
+                       rs->sr_flags = 0;
                        result = send_search_entry( op, rs );
                        sl_free( ctrls[num_ctrls-1]->ldctl_value.bv_val, op->o_tmpmemctx );
                        sl_free( ctrls[--num_ctrls], op->o_tmpmemctx );

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index fb25fe082bf7108418005945a92b39adcf6ad1a4..13b26cc07097a0a13b2f6aaf80b4a96c38b74331 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -1174,6 +1174,7 @@ slapi_search_internal(
                                rs.sr_type = REP_SEARCH;
                                rs.sr_err = LDAP_SUCCESS;
                                rs.sr_attrs = an;
+                               rs->sr_flags = REP_ENTRY_MODIFIABLE;
 
                                send_search_entry( op, &rs );
                        }

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 9a1fc49b32e0b3459d411ff5bd07777a18827f61..3944a4c81c5ca748163847e5dcb7e0db075fcb37 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1573,6 +1573,7 @@ slapi_send_ldap_search_entry(
        rs.sr_attrs = an;
        rs.sr_entry = e;
        rs.sr_v2ref = NULL;
+       rs.sr_flags = 0;
 
        if ( slapi_pblock_get( pb, SLAPI_OPERATION, (void *)&pOp ) != 0 ) {
                return LDAP_OTHER;