Update configure to:

[openldap] / include / ldap_log.h

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 08dab9cd081b230bacebbf1c5df62ac31317a16b..3a33843206f1e4f26f3d4b224f37c005d6804ca1 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -1,4 +1,13 @@
 /*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms 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.
+ */
+/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -17,28 +26,35 @@
 
 LDAP_BEGIN_DECL
 
+#define LDAP_DEBUG_TRACE       0x0001
+#define LDAP_DEBUG_PACKETS     0x0002
+#define LDAP_DEBUG_ARGS                0x0004
+#define LDAP_DEBUG_CONNS       0x0008
+#define LDAP_DEBUG_BER         0x0010
+#define LDAP_DEBUG_FILTER      0x0020
+#define LDAP_DEBUG_CONFIG      0x0040
+#define LDAP_DEBUG_ACL         0x0080
+#define LDAP_DEBUG_STATS       0x0100
+#define LDAP_DEBUG_STATS2      0x0200
+#define LDAP_DEBUG_SHELL       0x0400
+#define LDAP_DEBUG_PARSE       0x0800
+
+#define LDAP_DEBUG_DEPRECIATED 0x1000
+#define LDAP_DEBUG_NONE                0x8000
+#define LDAP_DEBUG_ANY         -1
+
 /* debugging stuff */
 #ifdef LDAP_DEBUG
+
+#ifndef ldap_debug
 extern int     ldap_debug;
+#endif /* !ldap_debug */
+
 #ifdef LDAP_SYSLOG
 extern int     ldap_syslog;
 extern int     ldap_syslog_level;
 #endif /* LDAP_SYSLOG */
 
-#define LDAP_DEBUG_TRACE       0x001
-#define LDAP_DEBUG_PACKETS     0x002
-#define LDAP_DEBUG_ARGS                0x004
-#define LDAP_DEBUG_CONNS       0x008
-#define LDAP_DEBUG_BER         0x010
-#define LDAP_DEBUG_FILTER      0x020
-#define LDAP_DEBUG_CONFIG      0x040
-#define LDAP_DEBUG_ACL         0x080
-#define LDAP_DEBUG_STATS       0x100
-#define LDAP_DEBUG_STATS2      0x200
-#define LDAP_DEBUG_SHELL       0x400
-#define LDAP_DEBUG_PARSE       0x800
-#define LDAP_DEBUG_ANY         0xffff
-
 /* this doesn't below as part of ldap.h */
 #ifdef LDAP_SYSLOG
 #define Debug( level, fmt, arg1, arg2, arg3 )  \