Commit cb3137d7 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Misc changes from HEAD

parent 0d0ae8a8
...@@ -636,13 +636,21 @@ retry:; ...@@ -636,13 +636,21 @@ retry:;
done:; done:;
rs->sr_err = rc; rs->sr_err = rc;
if ( rc != LDAP_SUCCESS && META_BACK_ONERR_STOP( mi ) ) { if ( rc != LDAP_SUCCESS ) {
if ( dolock ) {
ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
}
LDAP_BACK_CONN_BINDING_CLEAR( msc ); LDAP_BACK_CONN_BINDING_CLEAR( msc );
if ( META_BACK_ONERR_STOP( mi ) ) {
LDAP_BACK_CONN_TAINTED_SET( mc ); LDAP_BACK_CONN_TAINTED_SET( mc );
meta_back_release_conn_lock( op, mc, dolock ); meta_back_release_conn_lock( op, mc, dolock );
*mcp = NULL; *mcp = NULL;
}
if ( dolock ) {
ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
}
if ( sendok & LDAP_BACK_SENDERR ) { if ( META_BACK_ONERR_STOP( mi ) && ( sendok & LDAP_BACK_SENDERR ) ) {
send_ldap_result( op, rs ); send_ldap_result( op, rs );
} }
} }
......
...@@ -97,12 +97,14 @@ slapi_over_compute_output( ...@@ -97,12 +97,14 @@ slapi_over_compute_output(
{ {
Attribute **a; Attribute **a;
AttributeDescription *desc; AttributeDescription *desc;
SlapReply *rs = (SlapReply *)c->cac_private; SlapReply *rs;
if ( c == NULL || attribute == NULL || entry == NULL ) { if ( c == NULL || attribute == NULL || entry == NULL ) {
return 0; return 0;
} }
rs = (SlapReply *)c->cac_private;
assert( rs->sr_entry == entry ); assert( rs->sr_entry == entry );
desc = attribute->a_desc; desc = attribute->a_desc;
......
...@@ -624,7 +624,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value ) ...@@ -624,7 +624,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
break; break;
case SLAPI_MODIFY_MODS: { case SLAPI_MODIFY_MODS: {
LDAPMod **mods = NULL; LDAPMod **mods = NULL;
Modifications *ml; Modifications *ml = NULL;
pblock_get_default( pb, param, (void **)&mods ); pblock_get_default( pb, param, (void **)&mods );
if ( mods == NULL && pb->pb_intop == 0 ) { if ( mods == NULL && pb->pb_intop == 0 ) {
...@@ -635,13 +635,15 @@ pblock_get( Slapi_PBlock *pb, int param, void **value ) ...@@ -635,13 +635,15 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
case LDAP_REQ_MODRDN: case LDAP_REQ_MODRDN:
ml = pb->pb_op->orr_modlist; ml = pb->pb_op->orr_modlist;
break; break;
defaulat: default:
rc = PBLOCK_ERROR; rc = PBLOCK_ERROR;
break; break;
} }
if ( rc != PBLOCK_ERROR ) {
mods = slapi_int_modifications2ldapmods( ml ); mods = slapi_int_modifications2ldapmods( ml );
pblock_set_default( pb, param, (void *)mods ); pblock_set_default( pb, param, (void *)mods );
} }
}
*((LDAPMod ***)value) = mods; *((LDAPMod ***)value) = mods;
break; break;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment