From: Luke Howard <lukeh@openldap.org>
Date: Sun, 28 Dec 2003 04:17:48 +0000 (+0000)
Subject: Don't require slapi to be in the path - always include slapi/slapi.h
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~94
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0549d46adfa05cb6b5a51f9245452fa41c67020b;p=openldap

Don't require slapi to be in the path - always include slapi/slapi.h
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 06d9d762b3..5133c64ed2 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -37,7 +37,7 @@
 #include "lber_pvt.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif /* LDAPI_SLAPI */
 
 #define ACL_BUF_SIZE 	1024	/* use most appropriate size */
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 563b33800b..5e469d854d 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -34,9 +34,9 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
-static void init_add_pblock( Operation *op,
-	struct berval *dn, Entry *e, int manageDSAit );
+#include "slapi/slapi.h"
+
+static void init_add_pblock( Operation *op, struct berval *dn, Entry *e, int manageDSAit );
 static int call_add_preop_plugins( Operation *op );
 static void call_add_postop_plugins( Operation *op );
 #endif /* LDAP_SLAPI */
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 45e80031e6..e45cf3bca8 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -40,7 +40,7 @@
 #include "ldap_rq.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 /*
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 07c1616279..0c13bad30b 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -34,7 +34,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 228983af14..51e016d18a 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -32,7 +32,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static int compare_entry(
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5861d4dc5b..e8141d3b38 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -37,7 +37,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 #include "lutil.h"
 
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index d2883e1fd4..01b17e5886 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -39,7 +39,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 /* protected by connections_mutex */
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 8ae91b287f..c3edc3b79b 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -36,7 +36,7 @@
 #include "lutil.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index f3e85cf4a0..83e9af4a8b 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -40,7 +40,7 @@
 #include "lber_pvt.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 #define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 11d90a8420..8a2bd8282c 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -35,7 +35,7 @@
 #include "slap.h"
 #include "lber_pvt.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 /*
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 2879523351..609e184365 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -41,7 +41,7 @@
 #include "ldif.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 #ifdef LDAP_SIGCHLD
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index db3b5edb3f..3b2aeb91aa 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -34,7 +34,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 #include "lutil.h"
 
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 6f83037338..91f0442bee 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -41,7 +41,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 2ffbdbef39..1c5478f01f 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -34,7 +34,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static ldap_pvt_thread_mutex_t	slap_op_mutex;
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 0f0a61a30e..0a75e23024 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -38,7 +38,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int slap_null_cb( Operation *op, SlapReply *rs )
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index d1e89c6f91..3babefa9ae 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -25,7 +25,7 @@
 #include "lber_pvt.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static struct berval supportedFeatures[] = {
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 1bbe73e2dc..32fddc87ce 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -35,7 +35,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 
 static char **anlist2charray( Operation *op, AttributeName *an );
 static void init_search_pblock( Operation *op, char **attrs, int managedsait );