unifdef -UNEW_LOGGING

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index d93e9bb76bf919f7f57ee127c1cc0bcf9025bdae..4bdd4948da3807151270634ee41bc7821122c3f2 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -63,12 +63,8 @@ ldap_open( LDAP_CONST char *host, int port )
        int rc;
        LDAP            *ld;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( CONNECTION, ARGS, "ldap_open(%s, %d)\n", host, port, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_open(%s, %d)\n",
                host, port, 0 );
-#endif
 
        ld = ldap_init( host, port );
        if ( ld == NULL ) {
@@ -82,13 +78,8 @@ ldap_open( LDAP_CONST char *host, int port )
                ld = NULL;
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( CONNECTION, RESULTS, "ldap_open: %s\n",
-               ld == NULL ? "succeeded" : "failed", 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_open: %s\n",
                ld == NULL ? "succeeded" : "failed", 0, 0 );
-#endif
 
        return ld;
 }
@@ -114,11 +105,7 @@ ldap_create( LDAP **ldp )
                        return LDAP_LOCAL_ERROR;
        }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( CONNECTION, ENTRY, "ldap_create\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_create\n", 0, 0, 0 );
-#endif
 
        if ( (ld = (LDAP *) LDAP_CALLOC( 1, sizeof(LDAP) )) == NULL ) {
                return( LDAP_NO_MEMORY );
@@ -246,11 +233,7 @@ ldap_int_open_connection(
        char *host;
        int port, proto;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( CONNECTION, ENTRY, "ldap_int_open_connection\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_int_open_connection\n", 0, 0, 0 );
-#endif
 
        switch ( proto = ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) {
                case LDAP_PROTO_TCP: