ITS#7684

[openldap] / include / ldap_log.h

diff --git a/include/ldap_log.h b/include/ldap_log.h
index ca8274c241df125d7f88216977f0ebbe637351a7..0fa7bc2f2159dc4d32df8771ffaa08530b2161ee 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,7 @@ LDAP_BEGIN_DECL
 #define LDAP_DEBUG_SYNC                0x4000
 
 #define LDAP_DEBUG_NONE                0x8000
-#define LDAP_DEBUG_ANY         -1
+#define LDAP_DEBUG_ANY         (-1)
 
 /* debugging stuff */
 #ifdef LDAP_DEBUG
@@ -242,12 +242,27 @@ extern void eb_syslog(int pri, const char *fmt, ...);
 #define LogTest(level) ( 0 )
 #endif /* ! LDAP_DEBUG */
 
+/* Actually now in liblber/debug.c */
 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)));
 
+#ifdef LDAP_DEFINE_LDAP_DEBUG
+/* This struct matches the head of ldapoptions in <ldap-int.h> */
+struct ldapoptions_prefix {
+       short   ldo_valid;
+       int             ldo_debug;
+};
+#define ldap_debug \
+       (*(int *) ((char *)&ldap_int_global_options \
+                + offsetof(struct ldapoptions_prefix, ldo_debug)))
+
+struct ldapoptions;
+LDAP_V ( struct ldapoptions ) ldap_int_global_options;
+#endif /* LDAP_DEFINE_LDAP_DEBUG */
+
 LDAP_END_DECL
 
 #endif /* LDAP_LOG_H */