From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 8 Aug 1999 15:18:38 +0000 (+0000)
Subject: ldap_op.c: Get LDAP->ld_lberoptions from libldap/ldap-int.h.
X-Git-Tag: TWEB_OL_BASE~247
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bbd3d9e77c40a1d4eb0782d85ebc13e5a09daf00;p=openldap

ldap_op.c: Get LDAP->ld_lberoptions from libldap/ldap-int.h.
slurp.h:   #undef ldap_debug before a #define which conflicts with ldap-int.h.
---

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 8dfc7e157b..e8663c26f6 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -28,6 +28,11 @@
 
 #include <ac/krb.h>
 
+#if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
+/* Get LDAP->ld_lberoptions.  Must precede slurp.h, both define ldap_debug. */
+#include "../../libraries/libldap/ldap-int.h"
+#endif
+
 #include <lber.h>
 #include <ldap.h>
 
diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 274f1517d8..4573a71f24 100644
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -31,6 +31,7 @@
 
 #include <ldap.h>
 
+#undef  ldap_debug
 #define ldap_debug slurp_debug
 #include "ldap_log.h"