From: Howard Chu <hyc@openldap.org>
Date: Wed, 19 Jan 2011 21:20:10 +0000 (+0000)
Subject: ITS#5421 export ldap_debug define in <ldap_log.h>
X-Git-Tag: MIGRATION_CVS2GIT~189
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e542bd5498b89a17589ae5bc88214651a2a7d31e;p=openldap

ITS#5421 export ldap_debug define in <ldap_log.h>
---

diff --git a/include/ldap_log.h b/include/ldap_log.h
index a29241fd59..3e7b21b892 100644
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -196,12 +196,27 @@ extern void eb_syslog(int pri, const char *fmt, ...);
 	LogExpand((level), ldap_syslog_level, (fmt) \
 		LogArg(a1) LogArg(a2) LogArg(a3))
 
+/* 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 */
diff --git a/libraries/librewrite/rewrite-int.h b/libraries/librewrite/rewrite-int.h
index 72ad664f95..0f4d4c054f 100644
--- a/libraries/librewrite/rewrite-int.h
+++ b/libraries/librewrite/rewrite-int.h
@@ -33,7 +33,8 @@
 
 #include <lber.h>
 #include <ldap.h>
-#include "../libldap/ldap-int.h"
+#define LDAP_DEFINE_LDAP_DEBUG
+#include <ldap_log.h>
 #include <lutil.h>
 #include <avl.h>