From: Pierangelo Masarati Date: Wed, 17 Mar 2004 11:50:15 +0000 (+0000) Subject: reset SlapReply flags X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~246 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ec6a663820b7660f8c6f572343428ea0299b0f1e;p=openldap reset SlapReply flags --- diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c index 999bfe0a61..09954e13b3 100644 --- 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 986e4c5c70..6cf7697fda 100644 --- 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 2ff93defff..4aaaa8a458 100644 --- 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 ecb5fcdafb..c4e0a25131 100644 --- 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 46fa345711..e2d7ef63cc 100644 --- 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 1932583d17..3e3560e569 100644 --- 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 21b9a12fd9..4e1264e5cb 100644 --- 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 734beb3760..1a749eb17a 100644 --- 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 efbdcd9877..0eca1f703b 100644 --- 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 5d8308a07d..148f703360 100644 --- 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 fb25fe082b..13b26cc070 100644 --- 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 9a1fc49b32..3944a4c81c 100644 --- 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;