X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fdebug.c;h=a2166f021f622694679a205a5a56d74766ea16a0;hb=0355abeb1a0ea471970c5313a69ce5b20916b408;hp=044b9795a3eaab5adf25e09eb64c95f0fc97dd84;hpb=f0b25d7b2c656a16532f006a13b0fd4b0e2dd757;p=openldap
diff --git a/libraries/liblber/debug.c b/libraries/liblber/debug.c
index 044b9795a3..a2166f021f 100644
--- a/libraries/liblber/debug.c
+++ b/libraries/liblber/debug.c
@@ -1,7 +1,16 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2007 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
+ * .
*/
#include "portable.h"
@@ -23,117 +32,7 @@
#include "lber.h"
#include "ldap_pvt.h"
-struct DEBUGLEVEL
-{
- char *subsystem;
- int level;
-};
-
-int ldap_loglevels[LDAP_SUBSYS_NUM];
-static long numLevels = 0;
-
static FILE *log_file = NULL;
-static int global_level = 0;
-
-#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
-
-static char *lutil_levels[] = {"emergency", "alert", "critical",
- "error", "warning", "notice",
- "information", "entry", "args",
- "results", "detail1", "detail2",
- NULL};
-
-static char *lutil_subsys[LDAP_SUBSYS_NUM] = {"global","operation", "transport",
- "connection", "filter", "ber",
- "config", "acl", "cache", "index",
- "ldif", "tools", "slapd", "slurpd",
- "backend", "back_bdb", "back_ldbm",
- "back_ldap", "back_meta", "back_mon" };
-
-int lutil_mnem2subsys( const char *subsys )
-{
- int i;
- for( i = 0; i < LDAP_SUBSYS_NUM; i++ )
- {
- if ( !strcasecmp( subsys, lutil_subsys[i] ) )
- {
- return i;
- }
- }
- return -1;
-}
-
-void lutil_set_all_backends( level )
-{
- int i;
-
- for( i = 0; i < LDAP_SUBSYS_NUM; i++ )
- {
- if ( !strncasecmp( "back_", lutil_subsys[i], strlen("back_") ) )
- {
- ldap_loglevels[i] = level;
- }
- }
-}
-
-int lutil_mnem2level( const char *level )
-{
- int i;
- for( i = 0; lutil_levels[i] != NULL; i++ )
- {
- if ( !strcasecmp( level, lutil_levels[i] ) )
- {
- return i;
- }
- }
- return -1;
-}
-
-static int addSubsys( const char *subsys, int level )
-{
- int subsys_num;
-
- if ( !strcasecmp( subsys, "backend" ) )
- {
- lutil_set_all_backends( level );
- return level;
- }
- else
- {
- subsys_num = lutil_mnem2subsys(subsys);
- if(subsys_num < 0)
- {
- fprintf(stderr, "Unknown Subsystem name [ %s ] - Discarded\n",
- subsys);
- fflush(stderr);
- return -1;
- }
-
- ldap_loglevels[subsys_num] = level;
- return level;
- }
- return -1;
-}
-
-int lutil_set_debug_level( const char* subsys, int level )
-{
- return( addSubsys( subsys, level ) );
-}
int lutil_debug_file( FILE *file )
{
@@ -143,185 +42,53 @@ int lutil_debug_file( FILE *file )
return 0;
}
-void lutil_log_int(
- FILE* file,
- const char *subsys, int level,
- const char *fmt, va_list vl )
+void (lutil_debug)( int debug, int level, const char *fmt, ... )
{
-#ifdef HAVE_WINSOCK
- time_t now;
- struct tm *today;
-#endif
- size_t i;
- char * t_subsys;
- char * tmp;
+ char buffer[4096];
+ va_list vl;
- t_subsys = strdup(subsys);
-
- for(tmp = t_subsys, i = 0; i < strlen(t_subsys); i++, tmp++)
- *tmp = TOUPPER( (unsigned char) *tmp );
+ if ( !(level & debug ) ) return;
-#ifdef LDAP_SYSLOG
- /* we're configured to use syslog */
- if( use_syslog ) {
-#ifdef HAVE_VSYSLOG
- vsyslog( debug2syslog(level), fmt, vl );
-#else
- vsnprintf( data, sizeof(data), fmt, vl );
- syslog( debug2syslog(level), data );
-#endif
- return;
- }
-#endif
-
-#if 0
#ifdef HAVE_WINSOCK
if( log_file == NULL ) {
log_file = fopen( LDAP_RUNDIR LDAP_DIRSEP "openldap.log", "w" );
- if ( log_file == NULL )
+ if ( log_file == NULL ) {
log_file = fopen( "openldap.log", "w" );
-
- if ( log_file == NULL )
- return;
+ if ( log_file == NULL ) return;
+ }
ber_set_option( NULL, LBER_OPT_LOG_PRINT_FILE, log_file );
}
#endif
-#endif
-
- if( file == NULL ) {
- /*
- * Use stderr unless file was specified via:
- * ber_set_option( NULL, LBER_OPT_LOG_PRINT_FILE, file)
- */
- file = stderr;
- }
-
-#ifdef HAVE_WINSOCK
- /*
- * Stick the time in the buffer to output when using Winsock
- * as NT can't pipe to a timestamp program like Unix can.
- * This, of course, makes some logs hard to read.
- */
- time( &now );
- today = localtime( &now );
- fprintf( file, "%4d%02d%02d:%02d:%02d:%02d ",
- today->tm_year + 1900, today->tm_mon + 1,
- today->tm_mday, today->tm_hour,
- today->tm_min, today->tm_sec );
-#endif
-
- /*
- * format the output data.
- */
-
- fprintf(file, "\n%s:: ", t_subsys );
- vfprintf( file, fmt, vl );
- fflush( file );
-}
-/*
- * The primary logging routine. Takes the subsystem being logged from, the
- * level of the log output and the format and data. Send this on to the
- * internal routine with the print file, if any.
- */
-void lutil_log( const int subsys, int level, const char *fmt, ... )
-{
- FILE* outfile = NULL;
- va_list vl;
va_start( vl, fmt );
- ber_get_option( NULL, LBER_OPT_LOG_PRINT_FILE, &outfile );
- lutil_log_int( outfile, lutil_subsys[subsys], level, fmt, vl );
+ vsnprintf( buffer, sizeof(buffer), fmt, vl );
+ buffer[sizeof(buffer)-1] = '\0';
+ if( log_file != NULL ) {
+ fputs( buffer, log_file );
+ fflush( log_file );
+ }
+ fputs( buffer, stderr );
va_end( vl );
}
-void lutil_log_initialize(int argc, char **argv)
-{
- int i;
- /*
- * Start by setting the hook for the libraries to use this logging
- * routine.
- */
- ber_set_option( NULL, LBER_OPT_LOG_PROC, (void*)lutil_log_int );
-
- if ( argc == 0 ) return;
- /*
- * Now go through the command line options to set the debugging
- * levels
- */
- for( i = 0; i < argc; i++ )
- {
- char *next = argv[i];
-
- if ( i < argc-1 && next[0] == '-' && next[1] == 'd' )
- {
- char subsys[64];
- int level;
- char *optarg = argv[i+1];
- char *index = strchr( optarg, '=' );
- if ( index != NULL )
- {
- *index = 0;
- strcpy ( subsys, optarg );
- level = atoi( index+1 );
- if ( level <= 0 ) level = lutil_mnem2level( index + 1 );
- lutil_set_debug_level( subsys, level );
- *index = '=';
- }
- else
- {
- global_level = atoi( optarg );
- ldap_loglevels[0] = global_level;
- /*
- * if a negative number was used, make the global level the
- * maximum sane level.
- */
- if ( global_level < 0 )
- {
- global_level = 65535;
- ldap_loglevels[0] = 65535;
- }
- }
- }
- }
-}
-
-void (lutil_debug)( int debug, int level, const char *fmt, ... )
+#if defined(HAVE_EBCDIC) && defined(LDAP_SYSLOG)
+#undef syslog
+void eb_syslog( int pri, 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 "openldap.log", "w" );
-
- if ( log_file == NULL )
- log_file = fopen( "openldap.log", "w" );
-
- if ( log_file == NULL )
- return;
-
- ber_set_option( NULL, LBER_OPT_LOG_PRINT_FILE, log_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 ) {
- fputs( buffer, log_file );
- fflush( log_file );
- }
-
- fputs( buffer, stderr );
+ /* The syslog function appears to only work with pure EBCDIC */
+ __atoe(buffer);
+#pragma convlit(suspend)
+ syslog( pri, "%s", buffer );
+#pragma convlit(resume)
va_end( vl );
}
+#endif