fix previous commit (ITS#6267)

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index aa01eb5642c44f7de8bac7362ae49ed70f6544ca..e5d43d107e776cd2b7f0d98d8b27ccbd8c501c25 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 6c9979bd508e2781e2b8a763ca2847d95332628b..3d0cc728f1fb7a2e767ca9e7cf985e3926615ecc 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -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

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index d6962358ff999ef3da011504c708fa3ee80a9fda..880835349bb5938bdb4e659281903c7f7e33d50e 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -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",

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index ab7d77360ca322b1473c3e13417962c4fffb6c93..7ab1511b8b846caef5dae40f9f8a4ba3332b3fa9 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -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",