Commit 50d490be authored by Howard Chu's avatar Howard Chu
Browse files

Revert previous commit

parent 13d13bae
...@@ -1555,11 +1555,13 @@ static int connection_op_activate( Connection *conn, Operation *op ) ...@@ -1555,11 +1555,13 @@ static int connection_op_activate( Connection *conn, Operation *op )
if (!arg->co_op->o_dn.bv_len) { if (!arg->co_op->o_dn.bv_len) {
arg->co_op->o_authz = conn->c_authz; arg->co_op->o_authz = conn->c_authz;
arg->co_op->o_dn = conn->c_dn; arg->co_op->o_dn.bv_val = ch_strdup( conn->c_dn.bv_val ?
arg->co_op->o_ndn = conn->c_ndn; conn->c_dn.bv_val : "" );
arg->co_op->o_ndn.bv_val = ch_strdup( conn->c_ndn.bv_val ?
conn->c_ndn.bv_val : "" );
} }
arg->co_op->o_authtype = conn->c_authtype; arg->co_op->o_authtype = conn->c_authtype;
arg->co_op->o_authmech = conn->c_authmech; ber_dupbv( &arg->co_op->o_authmech, &conn->c_authmech );
if (!arg->co_op->o_protocol) { if (!arg->co_op->o_protocol) {
arg->co_op->o_protocol = conn->c_protocol arg->co_op->o_protocol = conn->c_protocol
......
...@@ -23,6 +23,15 @@ slap_op_free( Operation *op ) ...@@ -23,6 +23,15 @@ slap_op_free( Operation *op )
if ( op->o_ber != NULL ) { if ( op->o_ber != NULL ) {
ber_free( op->o_ber, 1 ); ber_free( op->o_ber, 1 );
} }
if ( op->o_dn.bv_val != NULL ) {
free( op->o_dn.bv_val );
}
if ( op->o_ndn.bv_val != NULL ) {
free( op->o_ndn.bv_val );
}
if ( op->o_authmech.bv_val != NULL ) {
free( op->o_authmech.bv_val );
}
if ( op->o_ctrls != NULL ) { if ( op->o_ctrls != NULL ) {
ldap_controls_free( op->o_ctrls ); ldap_controls_free( op->o_ctrls );
} }
......
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