works now

[openldap] / servers / slapd / back-meta / conn.c

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 0d3a4839ea23f001c0cc6d2df4dfc4de8476e9f0..00f1d9e9612fafed8de176e53758cf70037547ba 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -207,7 +207,7 @@ init_one_conn(
         */
        rs->sr_err = ldap_initialize( &lsc->ld, lt->uri );
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               return ldap_back_map_result( rs );
+               return slap_map_api2result( rs );
        }
 
        /*
@@ -342,15 +342,9 @@ meta_back_getconn(
                        return NULL;
                }
                                
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, INFO,
-                       "meta_back_getconn: got target %d for ndn=\"%s\" from cache\n", 
-                       i, ndn->bv_val, 0 );
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_CACHE,
        "==>meta_back_getconn: got target %d for ndn=\"%s\" from cache\n%s",
                                i, ndn->bv_val, "" );
-#endif /* !NEW_LOGGING */
 
                /*
                 * Clear all other candidates
@@ -456,14 +450,9 @@ meta_back_getconn(
                
                ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, INFO,
-                       "meta_back_getconn: conn %ld inserted\n", lc->conn->c_connid, 0, 0);
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_TRACE,
                        "=>meta_back_getconn: conn %ld inserted\n%s%s",
                        lc->conn->c_connid, "", "" );
-#endif /* !NEW_LOGGING */
                
                /*
                 * Err could be -1 in case a duplicate metaconn is inserted
@@ -475,14 +464,9 @@ meta_back_getconn(
                        return NULL;
                }
        } else {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_META, INFO,
-                       "meta_back_getconn: conn %ld fetched\n", lc->conn->c_connid, 0, 0 );
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_TRACE,
                        "=>meta_back_getconn: conn %ld fetched\n%s%s",
                        lc->conn->c_connid, "", "" );
-#endif /* !NEW_LOGGING */
        }
        
        return lc;