From 5427af1f620f3705c4d9cde352f75ccc1b60fb97 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 26 Jan 2005 09:52:12 +0000 Subject: [PATCH] don't play with controls at bind; rather use the ldap_*_ext API --- servers/slapd/back-meta/add.c | 2 +- servers/slapd/back-meta/compare.c | 2 +- servers/slapd/back-meta/delete.c | 2 +- servers/slapd/back-meta/modify.c | 2 +- servers/slapd/back-meta/modrdn.c | 2 +- servers/slapd/back-meta/search.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c index 15f13ee892..fe9af550d4 100644 --- a/servers/slapd/back-meta/add.c +++ b/servers/slapd/back-meta/add.c @@ -169,7 +169,7 @@ meta_back_add( Operation *op, SlapReply *rs ) attrs[ i ] = NULL; rs->sr_err = ldap_add_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val, - attrs, NULL, NULL ); + attrs, op->o_ctrls, NULL ); for ( --i; i >= 0; --i ) { free( attrs[ i ]->mod_bvalues ); free( attrs[ i ] ); diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c index 9a808a9581..3418717f7e 100644 --- a/servers/slapd/back-meta/compare.c +++ b/servers/slapd/back-meta/compare.c @@ -144,7 +144,7 @@ meta_back_compare( Operation *op, SlapReply *rs ) */ rc = ldap_compare_ext( lc->mc_conns[ i ].msc_ld, mdn.bv_val, mapped_attr.bv_val, &mapped_value, - NULL, NULL, &msgid[ i ] ); + op->o_ctrls, NULL, &msgid[ i ] ); if ( mdn.bv_val != op->o_req_dn.bv_val ) { free( mdn.bv_val ); diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c index 13f8f527d9..cd719c08d5 100644 --- a/servers/slapd/back-meta/delete.c +++ b/servers/slapd/back-meta/delete.c @@ -73,7 +73,7 @@ meta_back_delete( Operation *op, SlapReply *rs ) } (void)ldap_delete_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val, - NULL, NULL ); + op->o_ctrls, NULL ); if ( mdn.bv_val != op->o_req_dn.bv_val ) { free( mdn.bv_val ); diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c index 40709354a4..cd0a3ec00e 100644 --- a/servers/slapd/back-meta/modify.c +++ b/servers/slapd/back-meta/modify.c @@ -183,7 +183,7 @@ meta_back_modify( Operation *op, SlapReply *rs ) modv[ i ] = 0; rs->sr_err = ldap_modify_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val, - modv, NULL, NULL ); + modv, op->o_ctrls, NULL ); cleanup:; if ( mdn.bv_val != op->o_req_dn.bv_val ) { diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c index d4ea67f895..756ae36d38 100644 --- a/servers/slapd/back-meta/modrdn.c +++ b/servers/slapd/back-meta/modrdn.c @@ -119,7 +119,7 @@ meta_back_modrdn( Operation *op, SlapReply *rs ) op->orr_newrdn.bv_val, mnewSuperior.bv_val, op->orr_deleteoldrdn, - NULL, NULL ) != LDAP_SUCCESS; + op->o_ctrls, NULL ) != LDAP_SUCCESS; cleanup:; if ( mdn.bv_val != op->o_req_dn.bv_val ) { diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index cd2c3f7bc6..6bc693b64b 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -259,7 +259,7 @@ meta_back_search( Operation *op, SlapReply *rs ) rc = ldap_search_ext( lsc->msc_ld, mbase.bv_val, realscope, mfilter.bv_val, mapped_attrs, op->ors_attrsonly, - NULL, NULL, + op->o_ctrls, NULL, NULL, op->ors_slimit, &msgid[ i ] ); if ( mapped_attrs ) { free( mapped_attrs ); -- 2.39.5