really put SLAPI behind its #ifdef

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 172d32891a7b9eebb6cb98bc421879e3b691b9b4..4ebc6839eb2f5dbf3a0ecfe258a39cfcb47525f7 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -687,9 +687,9 @@ backend_unbind(
 )
 {
        int             i;
+#if defined( LDAP_SLAPI )
        Slapi_PBlock *pb = op->o_pb;
 
-#if defined( LDAP_SLAPI )
        int     rc;
        slapi_x_connection_set_pb( pb, conn );
        slapi_x_operation_set_pb( pb, op );

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 6ec136c75c1b966fa1d65ba29fb2ab724b3199ca..bd4816c4b32b2d0f7c86d8101af78bcc92b84a3c 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -49,7 +49,9 @@ do_bind(
        struct berval cred = { 0, NULL };
        Backend *be = NULL;
 
+#ifdef LDAP_SLAPI
        Slapi_PBlock *pb = op->o_pb;
+#endif
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, "do_bind: conn %d\n", conn->c_connid, 0, 0 );

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 450cd2ba9d3d649fa478599ccf69b959afa04e02..832c5eae8e0d2df4a6d4737e45fca6d7417a5235 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -49,7 +49,9 @@ do_compare(
        const char *text = NULL;
        int manageDSAit;
 
+#ifdef LDAP_SLAPI
        Slapi_PBlock *pb = op->o_pb;
+#endif
 
        ava.aa_desc = NULL;
 

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index aabcbd7e238a3c90eeef2d2de169c47af407949a..4d14b040ec516cb6c107f4a14d5966a52c657339 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -40,7 +40,9 @@ do_delete(
        int rc;
        int manageDSAit;
 
+#ifdef LDAP_SLAPI
        Slapi_PBlock *pb = op->o_pb;
+#endif
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, 

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 42ccaeeaf6ea672bfba5180c15d3664ecf724650..a07396679c2fbc309b3fd7a64dddd25b5dca04b9 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -42,17 +42,17 @@ do_modify(
        ber_len_t       len;
        Modifications   *modlist = NULL;
        Modifications   **modtail = &modlist;
-#ifdef LDAP_SLAPI
-       LDAPMod         **modv = NULL;
-#endif
 #ifdef LDAP_DEBUG
        Modifications *tmp;
+#endif
+#ifdef LDAP_SLAPI
+       LDAPMod         **modv = NULL;
+       Slapi_PBlock *pb = op->o_pb;
 #endif
        Backend         *be;
        int rc;
        const char      *text;
        int manageDSAit;
-       Slapi_PBlock *pb = op->o_pb;
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, "do_modify: enter\n", 0, 0, 0 );

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 16e26ac2658f8eb535d2193154948767659f0a18..62f0c6a2a0eb97979599c9f22b9d45ffd73b817c 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -65,7 +65,9 @@ do_modrdn(
        const char *text;
        int manageDSAit;
 
+#ifdef LDAP_SLAPI
        Slapi_PBlock *pb = op->o_pb;
+#endif
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 );

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index e7e7718d17fc054eeeb77c8f06e82d672592a052..187b3f41ac30801e02e6b2b8976596ca9bb3f524 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -10,6 +10,8 @@
  * without express or implied warranty.
  */
 
+#ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */
+
 #ifndef _SLAPI_H
 #define _SLAPI_H
 
@@ -526,4 +528,4 @@ LDAP_END_DECL
 #include "proto-slapi.h"
 
 #endif /* _SLAPI_H */
-
+#endif /* LDAP_SLAPI */