Commit 00116847 authored by Ondřej Kuzník's avatar Ondřej Kuzník
Browse files

Cleanup sasl_bind_mech resets

parent 9bd90a74
...@@ -306,14 +306,11 @@ request_bind( LloadConnection *client, LloadOperation *op ) ...@@ -306,14 +306,11 @@ request_bind( LloadConnection *client, LloadOperation *op )
rc = bind_mech_external( client, op, &credentials ); rc = bind_mech_external( client, op, &credentials );
/* terminate the upstream side if client switched mechanisms */ /* terminate the upstream side if client switched mechanisms */
if ( !BER_BVISNULL( &client->c_sasl_bind_mech ) ) { if ( pin ) {
op->o_client_refcnt++; op->o_client_refcnt++;
CONNECTION_UNLOCK_INCREF(client); CONNECTION_UNLOCK_INCREF(client);
operation_abandon( op ); operation_abandon( op );
CONNECTION_LOCK_DECREF(client); CONNECTION_LOCK_DECREF(client);
ber_memfree( client->c_sasl_bind_mech.bv_val );
BER_BVZERO( &client->c_sasl_bind_mech );
} }
ber_free( copy, 0 ); ber_free( copy, 0 );
...@@ -736,6 +733,10 @@ handle_whoami_response( ...@@ -736,6 +733,10 @@ handle_whoami_response(
return -1; return -1;
} }
upstream->c_state = LLOAD_C_READY; upstream->c_state = LLOAD_C_READY;
if ( !BER_BVISNULL( &upstream->c_sasl_bind_mech ) ) {
ber_memfree( upstream->c_sasl_bind_mech.bv_val );
BER_BVZERO( &upstream->c_sasl_bind_mech );
}
CONNECTION_UNLOCK_INCREF(upstream); CONNECTION_UNLOCK_INCREF(upstream);
......
Markdown is supported
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