Some LDAP_DEVEL cleanup

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 48dfa913dd1d0eeebf38112158823b995c264398..f3959b3ed590ed041ffd777b7de73222672f8835 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -387,14 +387,12 @@ access_allowed_mask(
                op->o_bd = LDAP_STAILQ_FIRST( &backendDB );
                be_null = 1;
 
-#ifdef LDAP_DEVEL
-               /*
-                * FIXME: experimental; use first backend rules
-                * iff there is no global_acl (ITS#3100) */
+               /* FIXME: experimental; use first backend rules
+                * iff there is no global_acl (ITS#3100)
+                */
                if ( frontendDB->be_acl != NULL ) {
                        op->o_bd = frontendDB;
                }
-#endif /* LDAP_DEVEL */
        }
        assert( op->o_bd != NULL );
 

diff --git a/servers/slapd/back-dnssrv/referral.c b/servers/slapd/back-dnssrv/referral.c
index 10da6a724ad43c2adea27b4f796f4105906e7466..586a538a79bc773d9545ffed68229e1324d0b2e0 100644 (file)
--- a/servers/slapd/back-dnssrv/referral.c
+++ b/servers/slapd/back-dnssrv/referral.c
@@ -42,13 +42,11 @@ dnssrv_back_referrals(
        BerVarray urls = NULL;
 
        if ( BER_BVISEMPTY( &op->o_req_dn ) ) {
-#ifdef LDAP_DEVEL
                /* FIXME: need some means to determine whether the database
                 * is a glue instance */
                if ( SLAP_GLUE_INSTANCE( op->o_bd ) ) {
                        return LDAP_SUCCESS;
                }
-#endif /* LDAP_DEVEL */
 
                rs->sr_text = "DNS SRV operation upon null (empty) DN disallowed";
                return LDAP_UNWILLING_TO_PERFORM;

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index b010c40dee5537534679d4f384e164fd744f8546..3cbc89647c3104dcd425604a288f07faf4f86127 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -48,7 +48,6 @@ dnssrv_back_search(
        rs->sr_ref = NULL;
 
        if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
-#ifdef LDAP_DEVEL
                /* FIXME: need some means to determine whether the database
                 * is a glue instance; if we got here with empty DN, then
                 * we passed this same test in dnssrv_back_referrals() */
@@ -60,7 +59,6 @@ dnssrv_back_search(
                        rs->sr_err = LDAP_SUCCESS;
                }
                goto done;
-#endif /* LDAP_DEVEL */
        }
 
        manageDSAit = get_manageDSAit( op );

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index a7aaabe989b8d0da5313e8ba46ab99b7533f5877..bdb382653223e69faf1b0da123bf36e555ed8f69 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -22,14 +22,15 @@
 
 #include "portable.h"
 
-#ifdef LDAP_DEVEL
-
 #include <stdio.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>
 
 #include "slap.h"
+
+#ifdef SLAP_DISTPROC
+
 #include "back-ldap.h"
 
 #include "config.h"
@@ -1007,4 +1008,4 @@ distproc_initialize( void )
        return overlay_register( &distproc );
 }
 
-#endif /* LDAP_DEVEL */
+#endif /* SLAP_DISTPROC */

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 74ef0b6b44a45603b8479557c3e7a71e3a5164c5..06cc1beda8c9b65bbf780a6f078913bcc513355a 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -84,7 +84,7 @@ ldap_back_initialize( BackendInfo *bi )
                return -1;
        }
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_DISTPROC
        if ( distproc_initialize() ) {
                return -1;
        }

diff --git a/servers/slapd/back-ldap/proto-ldap.h b/servers/slapd/back-ldap/proto-ldap.h
index 10539d1d353f149700c064e2018bd1412cf80fbc..d37eea9cbf782eb2cf3c03ab4eb6b4eed8084ce1 100644 (file)
--- a/servers/slapd/back-ldap/proto-ldap.h
+++ b/servers/slapd/back-ldap/proto-ldap.h
@@ -93,7 +93,7 @@ extern int slap_idassert_authzfrom_parse_cf( const char *fname, int lineno, cons
 extern int slap_idassert_parse_cf( const char *fname, int lineno, int argc, char *argv[], slap_idassert_t *si );
 
 extern int chain_initialize( void );
-#ifdef LDAP_DEVEL
+#ifdef SLAP_DISTPROC
 extern int distproc_initialize( void );
 #endif
 

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 21f0a1d34da0c8c6292e237ebfc1a2a6e8699f2f..a35036237c239044ba00882d99a6bd34846614c3 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -28,10 +28,6 @@
 #include "lutil.h"
 #include "back-monitor.h"
 
-#ifndef LDAP_DEVEL
-#define MONITOR_LEGACY_CONN
-#endif
-
 static int
 monitor_subsys_conn_update(
        Operation               *op,

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 27e7ffd1ab1fad12936d797a2ebb1866c0a5c742..60c50b07290d0d5d2816909ab5e35fca593ebc1d 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -39,8 +39,6 @@
 #include "slap.h"
 #include "lber_pvt.h"
 
-#define UNSUPPORTED_EXOP "unsupported extended operation"
-
 static struct extop_list {
        struct extop_list *next;
        struct berval oid;
@@ -261,11 +259,15 @@ load_extop2(
                return -1; 
        }
 
-       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) || BER_BVISEMPTY( ext_oid ) ) {
+       if ( ext_oid == NULL || BER_BVISNULL( ext_oid ) ||
+               BER_BVISEMPTY( ext_oid ) )
+       {
                return -1; 
        }
 
-       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) != LDAP_SUCCESS ) {
+       if ( numericoidValidate( NULL, (struct berval *)ext_oid ) !=
+               LDAP_SUCCESS )
+       {
                oidm.bv_val = oidm_find( ext_oid->bv_val );
                if ( ext_oid == NULL ) {
                        return -1;

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index a679e16f6e53e96e4f06272ad95b5a783119ed03..47fb55584a40a66d829befdbee03fe9f82e8e8d1 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -24,7 +24,7 @@
 
 #if LDAP_VENDOR_VERSION_MINOR != X && LDAP_VENDOR_VERSION_MINOR < 3
 #define OL_2_2_COMPAT
-#elif defined(LDAP_DEVEL) && SLAPD_OVER_DYNGROUP != SLAPD_MOD_STATIC
+#elif SLAPD_OVER_DYNGROUP != SLAPD_MOD_STATIC
 #define TAKEOVER_DYNGROUP
 #endif
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 99c5ddcb6a7872b4f2bd24aefcfc121d239b96e7..9177407c7679c109df5c936adf4c9ede90884a5f 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -71,6 +71,7 @@ LDAP_BEGIN_DECL
 
 #define LDAP_DYNAMIC_OBJECTS
 #define SLAP_CONTROL_X_TREE_DELETE LDAP_CONTROL_X_TREE_DELETE
+#define SLAP_DISTPROC
 
 #ifdef ENABLE_REWRITE
 #define SLAP_AUTH_REWRITE      1 /* use librewrite for sasl-regexp */