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

[openldap] / libraries / liblber / debug.c

diff --git a/libraries/liblber/debug.c b/libraries/liblber/debug.c
index de6f947145baef3575e5b8fac6ceba184a233631..20010fdf0952ac78cb2a572d780de7f1b8fd78c3 100644 (file)
--- a/libraries/liblber/debug.c
+++ b/libraries/liblber/debug.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,23 +34,6 @@
 
 static FILE *log_file = NULL;
 
-#ifdef LDAP_SYSLOG
-static int use_syslog = 0;
-
-static int debug2syslog(int l) {
-       switch (l) {
-       case LDAP_LEVEL_EMERG: return LOG_EMERG;
-       case LDAP_LEVEL_ALERT: return LOG_ALERT;
-       case LDAP_LEVEL_CRIT: return LOG_CRIT;
-       case LDAP_LEVEL_ERR: return LOG_ERR;
-       case LDAP_LEVEL_WARNING: return LOG_WARNING;
-       case LDAP_LEVEL_NOTICE: return LOG_NOTICE;
-       case LDAP_LEVEL_INFO: return LOG_INFO;
-       }
-       return LOG_DEBUG;
-}
-#endif
-
 int lutil_debug_file( FILE *file )
 {
        log_file = file;
@@ -79,8 +62,9 @@ void (lutil_debug)( int debug, int level, const char *fmt, ... )
        }
 #endif
 
+       sprintf(buffer, "%08x ", (unsigned) time(0L));
        va_start( vl, fmt );
-       vsnprintf( buffer, sizeof(buffer), fmt, vl );
+       vsnprintf( buffer+9, sizeof(buffer)-9, fmt, vl );
        buffer[sizeof(buffer)-1] = '\0';
        if( log_file != NULL ) {
                fputs( buffer, log_file );