Fix ldaps / TLS processing...

[openldap] / libraries / liblutil / debug.c

diff --git a/libraries/liblutil/debug.c b/libraries/liblutil/debug.c
index 3958d3e8c5483051632568d37c5b13fa47cdaa91..2ebce49700b6a3b73b292bab4a2d00a212c0f488 100644 (file)
--- a/libraries/liblutil/debug.c
+++ b/libraries/liblutil/debug.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996, 1998 by Internet Software Consortium.
  *
@@ -24,12 +29,14 @@
 
 #include "ldap_log.h"
 #include "ldap_defaults.h"
+#include "lber.h"
 
 static FILE *log_file;
 
 int lutil_debug_file( FILE *file )
 {
-       log_file = log_file;
+       log_file = file;
+       ber_set_option( NULL, LBER_OPT_LOG_PRINT_FILE, file );
 
        return 0;
 }
@@ -45,19 +52,24 @@ void (lutil_debug)( int level, int debug, const char *fmt, ... )
 #ifdef HAVE_WINSOCK
        if( log_file == NULL )
     {
-               log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
+               log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "openldap.log", "w" );
 
         if ( log_file == NULL )
-                       log_file = fopen( "slapd.log", "w" );
+                       log_file = fopen( "openldap.log", "w" );
 
                if ( log_file == NULL )
                        return;
+
+           ber_set_option( NULL, LBER_OPT_LOG_PRINT_FILE, file );
        }
 #endif
-
        va_start( vl, fmt );
 
+#ifdef HAVE_VSNPRINTF
        vsnprintf( buffer, sizeof(buffer), fmt, vl );
+#else
+       vsprintf( buffer, fmt, vl );
+#endif
        buffer[sizeof(buffer)-1] = '\0';
 
        if( log_file != NULL ) {
@@ -65,6 +77,6 @@ void (lutil_debug)( int level, int debug, const char *fmt, ... )
                fflush( log_file );
        }
 
-    puts(buffer );
+    fputs( buffer, stderr );
        va_end( vl );
 }