upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-15 19:34:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Pierangelo Masarati 2006-09-01 10:01:36 +00:00
parent 9e8725a3cc
commit cb3248f173
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libldap/request.c
View file

@ -420,6 +420,7 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
}
ldap_free_urldesc( srvfunc );
}
} else {
int msgid, rc;
struct berval passwd = BER_BVNULL;
@ -599,7 +600,10 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
}
#endif
/* FIXME: is this at all possible? */
/* FIXME: is this at all possible?
* ldap_ld_free() in unbind.c calls ldap_free_connection()
* with force == 1 __after__ explicitly calling
* ldap_free_request() on all requests */
if ( force ) {
LDAPRequest *lr;

3
servers/slapd/attr.c
View file

@ -78,8 +78,7 @@ Attribute *
attr_alloc( AttributeDescription *ad )
{
Attribute *a;
ldap_pvt_thread_mutex_lock( &attr_mutex );
if ( !attr_list )
attr_prealloc( CHUNK_SIZE );

16
servers/slapd/back-monitor/conn.c
View file

@ -181,7 +181,8 @@ monitor_subsys_conn_update(
for ( n = 0, c = connection_first( &connindex );
c != NULL;
n++, c = connection_next( c, &connindex ) ) {
n++, c = connection_next( c, &connindex ) )
{
/* No Op */ ;
}
connection_done( c );
@ -426,9 +427,6 @@ monitor_subsys_conn_create(
{
monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
Connection *c;
int connindex;
monitor_entry_t *mp;
int rc = SLAP_CB_CONTINUE;
monitor_subsys_t *ms;
@ -441,14 +439,18 @@ monitor_subsys_conn_create(
*ep = NULL;
if ( ndn == NULL ) {
Entry *e = NULL,
*e_tmp = NULL;
Connection *c;
int connindex;
Entry *e = NULL,
*e_tmp = NULL;
/* create all the children of e_parent */
for ( c = connection_first( &connindex );
c != NULL;
c = connection_next( c, &connindex ) )
{
monitor_entry_t *mp;
if ( conn_create( mi, c, &e, ms ) != SLAP_CB_CONTINUE
|| e == NULL )
{
@ -473,6 +475,8 @@ monitor_subsys_conn_create(
*ep = e;
} else {
Connection *c;
int connindex;
unsigned long connid;
char *next = NULL;
static struct berval nconn_bv = BER_BVC( "cn=connection " );