From: Ondřej Kuzník <ondra@openldap.org>
Date: Tue, 19 Feb 2019 17:14:26 +0000 (+0000)
Subject: ITS#8731 Make loading ldap-int.h possible from server code again
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ae7d5136f189b397d509c11b5e7d14355a8f28;p=thirdparty%2Fopenldap.git

ITS#8731 Make loading ldap-int.h possible from server code again
---

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index a5b7e46156..0037eeb0e4 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -71,7 +71,10 @@
 #	define LDAP_INT_GLOBAL_OPT() (&ldap_int_global_options)
 #endif
 
+/* if used from server code, ldap_debug already points elsewhere */
+#ifndef ldap_debug
 #define ldap_debug	((LDAP_INT_GLOBAL_OPT())->ldo_debug)
+#endif /* !ldap_debug */
 
 #define LDAP_INT_DEBUG
 #include "ldap_log.h"