X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_log.h;h=eb902986207323636fc6f96d1c2845702eba9295;hb=52a827466a88825b2b4a325783c8f7ec3a74bfba;hp=6cb34d5cc4d38774a7efe253abfab1bda4cb2279;hpb=be9a50af258c16083245db489aca5676c429f606;p=openldap
diff --git a/include/ldap_log.h b/include/ldap_log.h
index 6cb34d5cc4..eb90298620 100644
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -1,16 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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 at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -29,28 +31,6 @@
LDAP_BEGIN_DECL
-/*
- * While it's not important that the subsystem number are
- * contiguous, it is important that the LDAP_SUBSYS_NUM accurately
- * reflect the number of subsystems and LDAP_SUBSYS_MAX reflect
- * the largest subsystem number.
- */
-#define LDAP_SUBSYS_NUM 12
-#define LDAP_SUBSYS_MAX 11
-
-#define LDAP_SUBSYS_GLOBAL 0
-#define LDAP_SUBSYS_OPERATION 1
-#define LDAP_SUBSYS_TRANSPORT 2
-#define LDAP_SUBSYS_CONNECTION 3
-#define LDAP_SUBSYS_FILTER 4
-#define LDAP_SUBSYS_BACKEND 5
-#define LDAP_SUBSYS_BER 6
-#define LDAP_SUBSYS_CONFIG 7
-#define LDAP_SUBSYS_ACL 8
-#define LDAP_SUBSYS_CACHE 9
-#define LDAP_SUBSYS_INDEX 10
-#define LDAP_SUBSYS_LDIF 11
-
/*
* debug reporting levels.
*
@@ -86,14 +66,13 @@ LDAP_BEGIN_DECL
#define LDAP_DEBUG_PARSE 0x0800
#define LDAP_DEBUG_CACHE 0x1000
#define LDAP_DEBUG_INDEX 0x2000
+#define LDAP_DEBUG_SYNC 0x4000
-#define LDAP_DEBUG_DEPRECATED 0x1000
#define LDAP_DEBUG_NONE 0x8000
#define LDAP_DEBUG_ANY -1
/* debugging stuff */
#ifdef LDAP_DEBUG
-
/*
* This is a bogus extern declaration for the compiler. No need to ensure
* a 'proper' dllimport.
@@ -105,44 +84,44 @@ LDAP_BEGIN_DECL
# ifdef LDAP_SYSLOG
extern int ldap_syslog;
extern int ldap_syslog_level;
+
+# ifdef HAVE_EBCDIC
+# define syslog eb_syslog
+ extern void eb_syslog(int pri, const char *fmt, ...);
+# endif
+
# endif /* LDAP_SYSLOG */
/* this doesn't below as part of ldap.h */
# ifdef LDAP_SYSLOG
# define Debug( level, fmt, arg1, arg2, arg3 ) \
do { \
- lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
+ if ( ldap_debug & (level) ) \
+ lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
if ( ldap_syslog & (level) ) \
syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
} while ( 0 )
# else
# define Debug( level, fmt, arg1, arg2, arg3 ) \
- lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )
+ do { \
+ if ( ldap_debug & (level) ) \
+ lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
+ } while ( 0 )
# endif
-#ifndef LDAP_LOG
-# define LDAP_LOG(a) lutil_log a
-#endif
-
#else /* LDAP_DEBUG */
# define Debug( level, fmt, arg1, arg2, arg3 )
-#ifndef LDAP_LOG
-# define LDAP_LOG(a)
-#endif
-
#endif /* LDAP_DEBUG */
-
-LDAP_LUTIL_F(int) lutil_mnem2level LDAP_P(( char *level ));
-LDAP_LUTIL_F(void) lutil_log_initialize(int argc, char **argv);
-LDAP_LUTIL_F(void) lutil_set_debug_level LDAP_P(( char *subsys, int level ));
-LDAP_LUTIL_F(void) lutil_log LDAP_P(( char *subsys, int level, const char *fmt, ... ));
+#ifndef LDAP_LOG
+#define LDAP_LOG(a, b, fmt, arg1, arg2, arg3)
+#define LDAP_LOGS_TEST(a, b) 0
+#endif
LDAP_LUTIL_F(int) lutil_debug_file LDAP_P(( FILE *file ));
-
LDAP_LUTIL_F(void) lutil_debug LDAP_P((
int debug, int level,
const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));