mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
don't play with controls at bind; rather use the ldap_*_ext API
This commit is contained in:
parent
beb0f6983a
commit
5427af1f62
@ -169,7 +169,7 @@ meta_back_add( Operation *op, SlapReply *rs )
|
|||||||
attrs[ i ] = NULL;
|
attrs[ i ] = NULL;
|
||||||
|
|
||||||
rs->sr_err = ldap_add_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
|
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 ) {
|
for ( --i; i >= 0; --i ) {
|
||||||
free( attrs[ i ]->mod_bvalues );
|
free( attrs[ i ]->mod_bvalues );
|
||||||
free( attrs[ i ] );
|
free( attrs[ i ] );
|
||||||
|
@ -144,7 +144,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
|
|||||||
*/
|
*/
|
||||||
rc = ldap_compare_ext( lc->mc_conns[ i ].msc_ld, mdn.bv_val,
|
rc = ldap_compare_ext( lc->mc_conns[ i ].msc_ld, mdn.bv_val,
|
||||||
mapped_attr.bv_val, &mapped_value,
|
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 ) {
|
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
||||||
free( mdn.bv_val );
|
free( mdn.bv_val );
|
||||||
|
@ -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,
|
(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 ) {
|
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
||||||
free( mdn.bv_val );
|
free( mdn.bv_val );
|
||||||
|
@ -183,7 +183,7 @@ meta_back_modify( Operation *op, SlapReply *rs )
|
|||||||
modv[ i ] = 0;
|
modv[ i ] = 0;
|
||||||
|
|
||||||
rs->sr_err = ldap_modify_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
|
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:;
|
cleanup:;
|
||||||
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
||||||
|
@ -119,7 +119,7 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
|
|||||||
op->orr_newrdn.bv_val,
|
op->orr_newrdn.bv_val,
|
||||||
mnewSuperior.bv_val,
|
mnewSuperior.bv_val,
|
||||||
op->orr_deleteoldrdn,
|
op->orr_deleteoldrdn,
|
||||||
NULL, NULL ) != LDAP_SUCCESS;
|
op->o_ctrls, NULL ) != LDAP_SUCCESS;
|
||||||
|
|
||||||
cleanup:;
|
cleanup:;
|
||||||
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
if ( mdn.bv_val != op->o_req_dn.bv_val ) {
|
||||||
|
@ -259,7 +259,7 @@ meta_back_search( Operation *op, SlapReply *rs )
|
|||||||
rc = ldap_search_ext( lsc->msc_ld,
|
rc = ldap_search_ext( lsc->msc_ld,
|
||||||
mbase.bv_val, realscope, mfilter.bv_val,
|
mbase.bv_val, realscope, mfilter.bv_val,
|
||||||
mapped_attrs, op->ors_attrsonly,
|
mapped_attrs, op->ors_attrsonly,
|
||||||
NULL, NULL,
|
op->o_ctrls, NULL,
|
||||||
NULL, op->ors_slimit, &msgid[ i ] );
|
NULL, op->ors_slimit, &msgid[ i ] );
|
||||||
if ( mapped_attrs ) {
|
if ( mapped_attrs ) {
|
||||||
free( mapped_attrs );
|
free( mapped_attrs );
|
||||||
|
Loading…
Reference in New Issue
Block a user