Move nt_debug to -llutil and generalize for all platforms.

diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index 03d012a0de80bd7194204857250535fee72b4618..b5932cc985e25417c7272b811d68c2d7736f4ea7 100644 (file)
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -3,8 +3,9 @@
 ##
 
 LIBRARY        = liblutil.a
-SRCS   = base64.c detach.c md5.c passwd.c sha1.c getpass.c lockf.c
-OBJS   = base64.o detach.o md5.o passwd.o sha1.o getpass.o lockf.o @LIBOBJS@
+SRCS   = base64.c debug.c detach.c md5.c passwd.c sha1.c getpass.c lockf.c
+OBJS   = base64.o debug.o detach.o md5.o passwd.o sha1.o getpass.o lockf.o \
+       @LIBOBJS@
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries

diff --git a/libraries/liblutil/debug.c b/libraries/liblutil/debug.c
new file mode 100644 (file)
index 0000000..3958d3e
--- /dev/null
+++ b/libraries/liblutil/debug.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1996, 1998 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/stdarg.h>
+#include <ac/string.h>
+
+#include "ldap_log.h"
+#include "ldap_defaults.h"
+
+static FILE *log_file;
+
+int lutil_debug_file( FILE *file )
+{
+       log_file = log_file;
+
+       return 0;
+}
+
+void (lutil_debug)( int level, int debug, const char *fmt, ... )
+{
+       char buffer[4096];
+       va_list vl;
+
+       if ( !(level & debug ) )
+               return;
+
+#ifdef HAVE_WINSOCK
+       if( log_file == NULL )
+    {
+               log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
+
+        if ( log_file == NULL )
+                       log_file = fopen( "slapd.log", "w" );
+
+               if ( log_file == NULL )
+                       return;
+       }
+#endif
+
+       va_start( vl, fmt );
+
+       vsnprintf( buffer, sizeof(buffer), fmt, vl );
+       buffer[sizeof(buffer)-1] = '\0';
+
+       if( log_file != NULL ) {
+               fputs( buffer, log_file );
+               fflush( log_file );
+       }
+
+    puts(buffer );
+       va_end( vl );
+}

diff --git a/servers/slapd/nt_debug.c b/servers/slapd/nt_debug.c
deleted file mode 100644 (file)
index fc9027c..0000000
--- a/servers/slapd/nt_debug.c
+++ /dev/null
@@ -1,54 +0,0 @@
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdarg.h>
-#include <ac/string.h>
-
-#include "slap.h"
-#include "ldap_defaults.h"
-
-static FILE *log_file;
-
-int lutil_debug_file( FILE *file )
-{
-       log_file = log_file;
-
-       return 0;
-}
-
-void (lutil_debug)( int level, int debug, const char *fmt, ... )
-{
-       char buffer[4096];
-       va_list vl;
-
-       if ( !(level & debug ) )
-               return;
-
-#ifdef HAVE_WINSOCK
-       if( log_file == NULL )
-    {
-               log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "slapd.log", "w" );
-
-        if ( log_file == NULL )
-                       log_file = fopen( "slapd.log", "w" );
-
-               if ( log_file == NULL )
-                       return;
-       }
-#endif
-
-       va_start( vl, fmt );
-
-       vsnprintf( buffer, sizeof(buffer), fmt, vl );
-       buffer[sizeof(buffer)-1] = '\0';
-
-       if( log_file != NULL ) {
-               fputs( buffer, log_file );
-               fflush( log_file );
-       }
-
-    puts(buffer );
-       va_end( vl );
-}