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

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 */

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 */

servers/slapd/backend.c

@@ -40,7 +40,7 @@
 #include "ldap_rq.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 /*

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
 
 

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(

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"
 

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 */

servers/slapd/delete.c

@@ -36,7 +36,7 @@
 #include "lutil.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int

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"

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
 
 /*

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

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"
 

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

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;

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 )

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[] = {

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 );