ITS#4726 call ldap_pvt_tls_init() in init_ctx() to make sure initialization

[openldap] / libraries / libldap / print.c

diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 764f12850fafb9404b9a3aefea4e9a861a25c513..8bea418fc97d390b4dbd41199eee6c1dee06ad8b 100644 (file)
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -1,6 +1,16 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -25,63 +35,28 @@ static int ldap_log_check( LDAP *ld, int loglvl )
        if(ld == NULL) {
                errlvl = ldap_debug;
        } else {
-               errlvl = ld->ld_errno;
+               errlvl = ld->ld_debug;
        }
 
        return errlvl & loglvl ? 1 : 0;
 }
 
-int ldap_log_printf
-#ifdef HAVE_STDARG
-       ( LDAP *ld, int loglvl, char *fmt, ... )
-#else
-       ( va_alist )
-va_dcl
-#endif
+int ldap_log_printf( LDAP *ld, int loglvl, const char *fmt, ... )
 {
        char buf[ 1024 ];
        va_list ap;
 
-#ifdef HAVE_STDARG
-       va_start( ap, fmt );
-#else
-       LD *ld
-       int loglvl;
-       char *fmt;
-
-       va_start( ap );
-
-       errlvl = va_arg( ap, LD * );
-       loglvl = va_arg( ap, int );
-       fmt = va_arg( ap, char * );
-#endif
-
        if ( !ldap_log_check( ld, loglvl )) {
                return 0;
        }
 
-#ifdef HAVE_VSNPRINTF
+       va_start( ap, fmt );
+
        buf[sizeof(buf) - 1] = '\0';
        vsnprintf( buf, sizeof(buf)-1, fmt, ap );
-#elif HAVE_VSPRINTF
-       vsprintf( buf, fmt, ap ); /* hope it's not too long */
-#else
-       /* use doprnt() */
-       chokeme = "choke me! I don't have a doprnt manual handy!";
-#endif
 
        va_end(ap);
 
-       (*lber_pvt_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_pvt_log_print)( buf );
+       (*ber_pvt_log_print)( buf );
        return 1;
 }