don't play with controls at bind; rather use the ldap_*_ext API

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 15f13ee892e8bed5c31acd819f476469859f4431..fe9af550d499b8e1bb14232228666680b49a4d6e 100644 (file)
--- 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 9a808a9581cf21fae120b4c5ceb66210e8daed5f..3418717f7e88c61cec5eafc3dbdde94cb9f79a3b 100644 (file)
--- 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 13f8f527d982cf26f2365026d785872d4ee9fc1c..cd719c08d5e8102b4891857d2ac76a6e8883c5b0 100644 (file)
--- 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 40709354a4dafc2f5c3de380e12d6132f4a6c29e..cd0a3ec00ec6b8ee2d3c2a4af9097d69f98e1c89 100644 (file)
--- 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 d4ea67f895d2c9c950488f354fbfb1666df4cd2c..756ae36d387c71526d402a34d3a94ec58427889e 100644 (file)
--- 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 cd2c3f7bc6f34c00831d4df8b8b35145e32b0d90..6bc693b64b9893542f00576a828d325edd58ccd3 100644 (file)
--- 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 );