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 8dfc7e157baa18d1f3cc02183778f1e6296ebd4d..e8663c26f60716aed8f6b3b86366d1853b4a471b 100644 (file)
--- 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 274f1517d8511ed9f5f9989f57602b17a2383ed1..4573a71f246f906ffef9bcec7cff7590319a7dad 100644 (file)
--- 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"