upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous commit (ITS#6267)

Browse source
This commit is contained in:
Pierangelo Masarati 2009-08-24 00:41:12 +00:00
parent 12b570efe2
commit 20359f2020
4 changed files with 9 additions and 7 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

@ -452,6 +452,7 @@ typedef struct ldap_extra_t {
void (*retry_info_destroy)( slap_retry_info_t *ri );
int (*retry_info_parse)( char *in, slap_retry_info_t *ri, char *buf, ber_len_t buflen );
int (*retry_info_unparse)( slap_retry_info_t *ri, struct berval *bvout );
int (*connid2str)( const ldapconn_base_t *lc, char *buf, ber_len_t buflen );
} ldap_extra_t;
LDAP_END_DECL

3
servers/slapd/back-ldap/init.c
View file

@ -39,7 +39,8 @@ static const ldap_extra_t ldap_extra = {
slap_idassert_parse_cf,
slap_retry_info_destroy,
slap_retry_info_parse,
slap_retry_info_unparse
slap_retry_info_unparse,
ldap_back_connid2str
};
int

4
servers/slapd/back-meta/bind.c
View file

@ -663,7 +663,7 @@ meta_back_dobind(
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_dobind: conn=%s%s\n",
@ -803,7 +803,7 @@ retry_ok:;
done:;
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_dobind: conn=%s bound=%d\n",

8
servers/slapd/back-meta/conn.c
View file

@ -1170,7 +1170,7 @@ retry_lock:;
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_getconn: mc=%p conn=%s expired (tainted).\n",
@ -1662,7 +1662,7 @@ done:;
LDAP_BACK_CONN_CACHED_CLEAR( mc );
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_ANY,
"%s meta_back_getconn: candidates=%d conn=%s insert failed\n",
@ -1683,7 +1683,7 @@ done:;
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_getconn: candidates=%d conn=%s inserted\n",
@ -1693,7 +1693,7 @@ done:;
} else {
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[STRLENOF("4294967295U") + 1] = { 0 };
ldap_back_connid2str( &mc->mc_base, buf, sizeof(buf) );
mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_getconn: candidates=%d conn=%s fetched\n",