Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / print.c

diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 6de56dc0c9325dc158d14312f63d840a5170257b..f5d0bb0cd3faa8bda7bd706c51193845bb84a10f 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-2013 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,7 +35,7 @@ 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;
@@ -42,15 +52,8 @@ int ldap_log_printf( LDAP *ld, int loglvl, const char *fmt, ... )
 
        va_start( ap, fmt );
 
-#ifdef HAVE_VSNPRINTF
        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);