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 06d9d762b35b470c48bc77134bb8ecb08d615fa4..5133c64ed25cee98a4130765801085b2cbaf1851 100644 (file)
--- 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 563b33800be3b63af33341ffc6ef15b023d74878..5e469d854df6a58a30b6a9dc5c2d179f7b1f11c9 100644 (file)
--- 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 45e80031e63a629f6a6a41447a16dcd70a9ac141..e45cf3bca82a1cf67fce535cd8e0f72543c12b30 100644 (file)
--- 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 07c1616279caadd2a4ba4e52788457ddc77eddf9..0c13bad30bc6f2c22fc4457cf0aeebd7a69542b1 100644 (file)
--- 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 228983af14d08eb23de5954fb2b2ad3b9ca91bbe..51e016d18a0d52c2d8cd4e9bf60ccd20fb33784d 100644 (file)
--- 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 5861d4dc5b3b85fb92b5b0eaba9ecb4991d66c9e..e8141d3b38ec8da779ac5da82e3ffddc19e9cf68 100644 (file)
--- 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 d2883e1fd43d500a7f6542c1e07430c8347fcf71..01b17e58869d6f9a486e5796b2b3f0a3e97f93af 100644 (file)
--- 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 8ae91b287fc7fce34c29cd932fb2190c16bb5561..c3edc3b79bc14c6fbc01ec5538012a2203c8b053 100644 (file)
--- 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 f3e85cf4a0e30c4fef29c5401af815f7b764f866..83e9af4a8b2c5296d06f3ae172bf386348422fdd 100644 (file)
--- 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 11d90a8420881fcaa31c901784251638a227360a..8a2bd8282c5ffc0d5417ce244e99bf6012af9a89 100644 (file)
--- 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 2879523351dabdf531c14d2dc569d0e4e2f5fedb..609e184365ccf35026df9a32478a8c2359d07f7f 100644 (file)
--- 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 db3b5edb3feb9b4f3eca503e3579d8b2ad7b395a..3b2aeb91aa84731d5f281991f507e07d1a609931 100644 (file)
--- 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 6f830373384702d2ec2195f9bcd8d1db29424976..91f0442bee5615d1b3babc99baca7dc984e9fd56 100644 (file)
--- 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 2ffbdbef39c2fa0d6cacdd886aedff06da0398f8..1c5478f01fb943ecd9da565fd6787d8b73c732b8 100644 (file)
--- 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 0f0a61a30e4c3f8d738c83e13bc03fd97683aff7..0a75e2302494b1271b4a4f370dddd8edfccbbbe5 100644 (file)
--- 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 d1e89c6f91d7a39684a7846ef6ef571691b80988..3babefa9ae83c2172324c9369f33b2fbd04dff14 100644 (file)
--- 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 1bbe73e2dca6b692635709bca390b44215cc95c6..32fddc87ceded6bdafb5b4082a4b95861961ec92 100644 (file)
--- 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 );