c[0].ldctl_iscritical = si->si_type < 0;
ctrls[0] = &c[0];
- if ( si->si_authzId ) {
+ if ( si->si_bindconf.sb_authzId ) {
c[1].ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
- ber_str2bv( si->si_authzId, 0, 0, &c[1].ldctl_value );
+ ber_str2bv( si->si_bindconf.sb_authzId, 0, 0, &c[1].ldctl_value );
c[1].ldctl_iscritical = 1;
ctrls[1] = &c[1];
ctrls[2] = NULL;
psub = &si->si_be->be_nsuffix[0];
/* Init connection to master */
- rc = ldap_initialize( &si->si_ld, si->si_provideruri );
+ rc = ldap_initialize( &si->si_ld, si->si_provideruri.bv_val );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"do_syncrep1: ldap_initialize failed (%s)\n",
- si->si_provideruri, 0, 0 );
+ si->si_provideruri.bv_val, 0, 0 );
return rc;
}
/* Bind to master */
- if ( si->si_tls ) {
+ if ( si->si_bindconf.sb_tls ) {
rc = ldap_start_tls_s( si->si_ld, NULL, NULL );
if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"%s: ldap_start_tls failed (%d)\n",
- si->si_tls == SYNCINFO_TLS_CRITICAL ? "Error" : "Warning",
+ si->si_bindconf.sb_tls == SB_TLS_CRITICAL ? "Error" : "Warning",
rc, 0 );
- if( si->si_tls == SYNCINFO_TLS_CRITICAL ) goto done;
+ if( si->si_bindconf.sb_tls == SB_TLS_CRITICAL ) goto done;
}
}
- if ( si->si_bindmethod == LDAP_AUTH_SASL ) {
+ if ( si->si_bindconf.sb_method == LDAP_AUTH_SASL ) {
#ifdef HAVE_CYRUS_SASL
void *defaults;
- if ( si->si_secprops != NULL ) {
+ if ( si->si_bindconf.sb_secprops != NULL ) {
rc = ldap_set_option( si->si_ld,
- LDAP_OPT_X_SASL_SECPROPS, si->si_secprops);
+ LDAP_OPT_X_SASL_SECPROPS, si->si_bindconf.sb_secprops);
if( rc != LDAP_OPT_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option "
"(%s,SECPROPS,\"%s\") failed!\n",
- si->si_provideruri, si->si_secprops, 0 );
+ si->si_provideruri.bv_val, si->si_bindconf.sb_secprops, 0 );
goto done;
}
}
- defaults = lutil_sasl_defaults( si->si_ld, si->si_saslmech,
- si->si_realm, si->si_authcId, si->si_passwd, si->si_authzId );
+ defaults = lutil_sasl_defaults( si->si_ld, si->si_bindconf.sb_saslmech,
+ si->si_bindconf.sb_realm, si->si_bindconf.sb_authcId,
+ si->si_bindconf.sb_cred, si->si_bindconf.sb_authzId );
rc = ldap_sasl_interactive_bind_s( si->si_ld,
- si->si_binddn,
- si->si_saslmech,
+ si->si_bindconf.sb_binddn,
+ si->si_bindconf.sb_saslmech,
NULL, NULL,
LDAP_SASL_QUIET,
lutil_sasl_interact,
/* FIXME (see above comment) */
/* if Kerberos credentials cache is not active, retry */
- if ( strcmp( si->si_saslmech, "GSSAPI" ) == 0 &&
+ if ( strcmp( si->si_bindconf.sb_saslmech, "GSSAPI" ) == 0 &&
rc == LDAP_LOCAL_ERROR )
{
rc = LDAP_SERVER_DOWN;
#endif
} else {
- rc = ldap_bind_s( si->si_ld,
- si->si_binddn, si->si_passwd, si->si_bindmethod );
+ rc = ldap_bind_s( si->si_ld, si->si_bindconf.sb_binddn,
+ si->si_bindconf.sb_cred, si->si_bindconf.sb_method );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "do_syncrep1: "
"ldap_bind_s failed (%d)\n", rc, 0, 0 );
msg != NULL;
msg = ldap_next_message( si->si_ld, msg ) )
{
+ if ( slapd_shutdown ) {
+ rc = -2;
+ goto done;
+ }
switch( ldap_msgtype( msg ) ) {
case LDAP_RES_SEARCH_ENTRY:
ldap_get_entry_controls( si->si_ld, msg, &rctrls );
if ( si == NULL )
return NULL;
+ ldap_pvt_thread_mutex_lock( &si->si_mutex );
+
switch( abs( si->si_type )) {
case LDAP_SYNC_REFRESH_ONLY:
case LDAP_SYNC_REFRESH_AND_PERSIST:
break;
default:
+ ldap_pvt_thread_mutex_unlock( &si->si_mutex );
return NULL;
}
ldap_unbind( si->si_ld );
si->si_ld = NULL;
}
+ ldap_pvt_thread_mutex_unlock( &si->si_mutex );
return NULL;
}
}
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+ ldap_pvt_thread_mutex_unlock( &si->si_mutex );
return NULL;
}
SlapReply rs_add = {REP_RESULT};
SlapReply rs_modify = {REP_RESULT};
Filter f = {0};
- AttributeAssertion ava = {0};
+ AttributeAssertion ava = { NULL, BER_BVNULL, NULL };
int rc = LDAP_SUCCESS;
int ret = LDAP_SUCCESS;
struct berval pdn = BER_BVNULL;
- struct berval org_req_dn = BER_BVNULL;
- struct berval org_req_ndn = BER_BVNULL;
- struct berval org_dn = BER_BVNULL;
- struct berval org_ndn = BER_BVNULL;
- int org_managedsait;
dninfo dni = {0};
int retry = 1;
cb.sc_response = null_callback;
cb.sc_private = si;
- org_req_dn = op->o_req_dn;
- org_req_ndn = op->o_req_ndn;
- org_dn = op->o_dn;
- org_ndn = op->o_ndn;
- org_managedsait = get_manageDSAit( op );
- op->o_dn = op->o_bd->be_rootdn;
- op->o_ndn = op->o_bd->be_rootndn;
- op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
-
if ( entry && !BER_BVISNULL( &entry->e_name ) ) {
Debug( LDAP_DEBUG_SYNC,
"syncrepl_entry: %s\n",
dni.dn.bv_val ? dni.dn.bv_val : "(null)", 0, 0 );
}
- org_req_dn = op->o_req_dn;
- org_req_ndn = op->o_req_ndn;
- org_managedsait = get_manageDSAit( op );
- op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
-
if ( syncstate != LDAP_SYNC_DELETE ) {
Attribute *a = attr_find( entry->e_attrs, slap_schema.si_ad_entryUUID );
struct berval pdn = BER_BVNULL;
struct berval org_req_dn = BER_BVNULL;
struct berval org_req_ndn = BER_BVNULL;
- int org_managedsait;
op->o_req_dn = si->si_base;
op->o_req_ndn = si->si_base;
if ( uuids ) {
Filter uf;
- AttributeAssertion eq;
+ AttributeAssertion eq = { NULL, BER_BVNULL, NULL };
int i;
op->ors_attrsonly = 1;
op->ors_attrs = slap_anlist_no_attrs;
op->ors_limit = NULL;
op->ors_filter = &uf;
- op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
uf.f_ava = &eq;
uf.f_av_desc = slap_schema.si_ad_entryUUID;
op->ors_filter = str2filter_x( op, si->si_filterstr.bv_val );
op->ors_filterstr = si->si_filterstr;
op->o_nocaching = 1;
- op->o_managedsait = SLAP_CONTROL_NONE;
if ( limits_check( op, &rs_search ) == 0 ) {
rc = be->be_search( op, &rs_search );
if ( op->ors_filter ) filter_free_x( op, op->ors_filter );
}
- op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
op->o_nocaching = 0;
if ( !LDAP_LIST_EMPTY( &si->si_nonpresentlist ) ) {
rc = be->be_modify( op, &rs_modify );
}
- org_managedsait = get_manageDSAit( op );
- op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
-
while ( rs_delete.sr_err == LDAP_SUCCESS &&
op->o_delete_glue_parent ) {
op->o_delete_glue_parent = 0;
}
}
- op->o_managedsait = org_managedsait;
- op->o_req_dn = org_req_dn;
- op->o_req_ndn = org_req_ndn;
op->o_delete_glue_parent = 0;
ber_bvfree( np_prev->npe_name );
ber_bvfree( np_prev->npe_nname );
- BER_BVZERO( &op->o_req_dn );
- BER_BVZERO( &op->o_req_ndn );
ch_free( np_prev );
}
void
syncinfo_free( syncinfo_t *sie )
{
- if ( sie->si_provideruri ) {
- ch_free( sie->si_provideruri );
- }
- if ( sie->si_provideruri_bv ) {
- ber_bvarray_free( sie->si_provideruri_bv );
- }
- if ( sie->si_binddn ) {
- ch_free( sie->si_binddn );
- }
- if ( sie->si_passwd ) {
- ch_free( sie->si_passwd );
- }
- if ( sie->si_saslmech ) {
- ch_free( sie->si_saslmech );
- }
- if ( sie->si_secprops ) {
- ch_free( sie->si_secprops );
- }
- if ( sie->si_realm ) {
- ch_free( sie->si_realm );
- }
- if ( sie->si_authcId ) {
- ch_free( sie->si_authcId );
- }
- if ( sie->si_authzId ) {
- ch_free( sie->si_authzId );
+ ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
+ if ( !BER_BVISNULL( &sie->si_provideruri ) ) {
+ ch_free( sie->si_provideruri.bv_val );
}
+
+ bindconf_free( &sie->si_bindconf );
+
if ( sie->si_filterstr.bv_val ) {
ch_free( sie->si_filterstr.bv_val );
}
projects / openldap / blobdiff