mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove unrequired member; address ITS#3913

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-08-02 22:48:30 +00:00
parent 9da3dbf3c8
commit 4ed743cc84
6 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servers/slapd/back-ldap/back-ldap.h
View File

@ -38,7 +38,6 @@ struct ldapconn {
struct berval lc_local_ndn;
int lc_bound;
int lc_ispriv;
ldap_pvt_thread_mutex_t lc_mutex;
unsigned lc_refcnt;
};

13
servers/slapd/back-ldap/bind.c
View File

@ -457,8 +457,6 @@ retry_lock:;
lc->lc_conn = lc_curr.lc_conn;
ber_dupbv( &lc->lc_local_ndn, &lc_curr.lc_local_ndn );
ldap_pvt_thread_mutex_init( &lc->lc_mutex );
if ( lc_curr.lc_ispriv ) {
ber_dupbv( &lc->lc_cred, &li->acl_passwd );
ber_dupbv( &lc->lc_bound_ndn, &li->acl_authcDN );
@ -553,8 +551,7 @@ retry_lock:;
* it from all the callers, and I made the function return the flag, so
* it can be used to simplify the check.
*
* Note: lc_mutex is locked; dolock indicates whether li->conn_mutex
* must be locked or not
* Note: dolock indicates whether li->conn_mutex must be locked or not
*/
static int
ldap_back_dobind_int(
@ -707,13 +704,7 @@ done:;
int
ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
{
int rc;
ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
rc = ldap_back_dobind_int( lc, op, rs, sendok, 1, 1 );
ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
return rc;
return ldap_back_dobind_int( lc, op, rs, sendok, 1, 1 );
}
/*

4
servers/slapd/back-ldap/delete.c
View File

@ -45,14 +45,14 @@ ldap_back_delete(
lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
return -1;
return rs->sr_err;
}
ctrls = op->o_ctrls;
rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
if ( rc != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
rc = -1;
rc = rs->sr_err;
goto cleanup;
}

1
servers/slapd/back-ldap/init.c
View File

@ -216,7 +216,6 @@ ldap_back_conn_free( void *v_lc )
if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
ch_free( lc->lc_local_ndn.bv_val );
}
ldap_pvt_thread_mutex_destroy( &lc->lc_mutex );
ch_free( lc );
}

2
servers/slapd/back-ldap/modify.c
View File

@ -48,7 +48,7 @@ ldap_back_modify(
lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
return -1;
return rs->sr_err;
}
for ( i = 0, ml = op->oq_modify.rs_modlist; ml; i++, ml = ml->sml_next )

2
servers/slapd/back-ldap/modrdn.c
View File

@ -45,7 +45,7 @@ ldap_back_modrdn(
lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
return -1;
return rs->sr_err;
}
if ( op->orr_newSup ) {