From: Howard Chu <hyc@openldap.org>
Date: Wed, 19 Jan 2011 21:27:16 +0000 (+0000)
Subject: ITS#5421 drop ldap-int.h
X-Git-Tag: MIGRATION_CVS2GIT~188
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d3b09ef2a90b123151c49bb8cae7952c38452471;p=openldap

ITS#5421 drop ldap-int.h
---

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index c8beb3a846..42e9504925 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -33,9 +33,6 @@
 #include "slap.h"
 #include "back-ldap.h"
 #include "lutil.h"
-#undef ldap_debug	/* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
-
 #include "lutil_ldap.h"
 
 #define LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ	"2.16.840.1.113730.3.4.12"
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index a94862fb18..8dba7b0942 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -34,9 +34,6 @@
 #include "back-ldap.h"
 #include "lutil.h"
 #include "ldif.h"
-#undef ldap_debug
-/* for advanced URL parsing */
-#include "../../../libraries/libldap/ldap-int.h"
 
 static SLAP_EXTOP_MAIN_FN ldap_back_exop_whoami;
 
diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index ff8f019cbf..4a425a170c 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -31,8 +31,7 @@
 
 #include "slap.h"
 #include "back-ldap.h"
-#undef ldap_debug	/* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
+#include "../../../libraries/liblber/lber-int.h"
 
 #include "lutil.h"
 
diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 11d69ee70a..24272b2aca 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -33,8 +33,6 @@
 #include "slap.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
-#undef ldap_debug	/* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
 
 #include "lutil_ldap.h"
 
diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index ca9be988c5..a6a660f3e9 100644
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -30,8 +30,6 @@
 #include "slap.h"
 #include "lutil.h"
 #include "../back-ldap/back-ldap.h"
-#undef ldap_debug       /* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
 #include "back-meta.h"
 
 static int
diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index da5aede4a0..f1ac80d275 100644
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -61,9 +61,6 @@
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
-#undef ldap_debug	/* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
-
 int
 mapping_cmp ( const void *c1, const void *c2 )
 {
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 8e40049851..f0018d31b8 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -32,9 +32,7 @@
 #include "slap.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
-#undef ldap_debug	/* silence a warning in ldap-int.h */
-#include "ldap_log.h"
-#include "../../../libraries/libldap/ldap-int.h"
+#include "../../../libraries/liblber/lber-int.h"
 
 /* IGNORE means that target does not (no longer) participate
  * in the search;