upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-31 20:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

more on ITS#3808

Browse source
This commit is contained in:
Pierangelo Masarati 2005-06-29 12:28:40 +00:00
parent 196af0e056
commit 671b02f748
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/libldap/os-ip.c
View file

@ -903,6 +903,7 @@ ldap_int_select( LDAP *ld, struct timeval *timeout )
#endif
sip = (struct selectinfo *)ld->ld_selectinfo;
assert( sip != NULL );
#ifdef HAVE_POLL
{

23
servers/slapd/back-ldap/bind.c
View file

@ -101,17 +101,25 @@ done:;
/* must re-insert if local DN changed as result of bind */
if ( lc->lc_bound && !dn_match( &op->o_req_ndn, &lc->lc_local_ndn ) ) {
int lerr;
struct ldapconn *tmplc;
int lerr;
ldap_pvt_thread_mutex_lock( &li->conn_mutex );
lc = avl_delete( &li->conntree, (caddr_t)lc,
tmplc = avl_delete( &li->conntree, (caddr_t)lc,
ldap_back_conn_cmp );
if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
ch_free( lc->lc_local_ndn.bv_val );
if ( tmplc != NULL ) {
if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
ch_free( lc->lc_local_ndn.bv_val );
}
ber_dupbv( &lc->lc_local_ndn, &op->o_req_ndn );
lerr = avl_insert( &li->conntree, (caddr_t)lc,
ldap_back_conn_cmp, ldap_back_conn_dup );
} else {
/* something BAD happened */
lerr = -1;
rc = LDAP_OTHER;
}
ber_dupbv( &lc->lc_local_ndn, &op->o_req_ndn );
lerr = avl_insert( &li->conntree, (caddr_t)lc,
ldap_back_conn_cmp, ldap_back_conn_dup );
ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
if ( lerr == -1 ) {
ldap_back_conn_free( lc );
@ -444,6 +452,7 @@ ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok )
/* Err could be -1 in case a duplicate ldapconn is inserted */
if ( rs->sr_err != 0 ) {
ldap_back_conn_free( lc );
rs->sr_err = LDAP_OTHER;
if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
send_ldap_error( op, rs, LDAP_OTHER,
"internal server error" );

2
servers/slapd/back-ldap/search.c
View file

@ -286,7 +286,7 @@ fail:;
e = ldap_first_entry( lc->lc_ld, res );
rc = ldap_build_entry( op, e, &ent, &bdn );
if ( rc == LDAP_SUCCESS ) {
if ( rc == LDAP_SUCCESS ) {
rs->sr_entry = &ent;
rs->sr_attrs = op->ors_attrs;
rs->sr_operational_attrs = NULL;