ITS#5421 drop ldap-int.h

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index c8beb3a8460605e4b06c3f4bb8bf4d9443eba64e..42e95049256eb132207a74b61fdf1010a35cc41a 100644 (file)
--- 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 a94862fb18f3b1a556517c2567e790d5d970091b..8dba7b0942fe12f954af373f627ff77a39b0fe15 100644 (file)
--- 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 ff8f019cbfbc54dbd0372b54bf08ca68d2bb7cea..4a425a170cee20c62ec5affc59e7138256bbfea7 100644 (file)
--- 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 11d69ee70abf7c7e92cde53c264371bd19bd819a..24272b2aca89a620004fd9bc9cedecf98f71a474 100644 (file)
--- 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 ca9be988c5994e39b9a62dbe1872cbf52d46c22d..a6a660f3e911e7bf604ccc94cb9becb333929ca2 100644 (file)
--- 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 da5aede4a0e0c86b52be15efb63034fef561ec8a..f1ac80d2758e6473e014a94a450fa02221ee60b5 100644 (file)
--- 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 8e400498516d61cd40b92224d6c2c2247a07495a..f0018d31b89725ec7c10a44e556c8f5c3abed66d 100644 (file)
--- 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;