Partial support for a new option to help debug TLS connections,

[openldap] / libraries / libldap / print.c

diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 4b865b7b4884338b718228aef80a88f5e11bd667..f8203c1604def10e36157f19abad00dd34caee2a 100644 (file)
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -14,8 +14,6 @@
 
 #include "ldap-int.h"
 
-extern BER_LOG_PRINT_FN lber_log_print;
-
 /*
  * ldap log 
  */
@@ -35,7 +33,7 @@ static int ldap_log_check( LDAP *ld, int loglvl )
 
 int ldap_log_printf
 #ifdef HAVE_STDARG
-       ( LDAP *ld, int loglvl, char *fmt, ... )
+       ( LDAP *ld, int loglvl, const char *fmt, ... )
 #else
        ( va_alist )
 va_dcl
@@ -47,13 +45,13 @@ va_dcl
 #ifdef HAVE_STDARG
        va_start( ap, fmt );
 #else
-       LD *ld
+       LDAP *ld;
        int loglvl;
        char *fmt;
 
        va_start( ap );
 
-       errlvl = va_arg( ap, LD * );
+       ld = va_arg( ap, LDAP * );
        loglvl = va_arg( ap, int );
        fmt = va_arg( ap, char * );
 #endif
@@ -74,16 +72,6 @@ va_dcl
 
        va_end(ap);
 
-       (*lber_log_print)( buf );
-       return 1;
-}
-
-static int lber_log_puts(int errlvl, int loglvl, char *buf)
-{
-       if ( !ldap_log_check( errlvl, loglvl )) {
-               return 0;
-       }
-
-       (*lber_log_print)( buf );
+       (*ber_pvt_log_print)( buf );
        return 1;
 }