From d9720d50dda765a54d6b3be8bfe122fb259f329d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 15 Aug 2006 19:36:54 +0000 Subject: [PATCH] Some LDAP_DEVEL cleanup --- servers/slapd/acl.c | 8 +++----- servers/slapd/back-dnssrv/referral.c | 2 -- servers/slapd/back-dnssrv/search.c | 2 -- servers/slapd/back-ldap/distproc.c | 7 ++++--- servers/slapd/back-ldap/init.c | 2 +- servers/slapd/back-ldap/proto-ldap.h | 2 +- servers/slapd/back-monitor/conn.c | 4 ---- servers/slapd/extended.c | 10 ++++++---- servers/slapd/overlays/dynlist.c | 2 +- servers/slapd/slap.h | 1 + 10 files changed, 17 insertions(+), 23 deletions(-) diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index 48dfa913dd..f3959b3ed5 100644 --- 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 10da6a724a..586a538a79 100644 --- 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 b010c40dee..3cbc89647c 100644 --- 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 a7aaabe989..bdb3826532 100644 --- 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 #include #include #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 74ef0b6b44..06cc1beda8 100644 --- 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 10539d1d35..d37eea9cbf 100644 --- 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 21f0a1d34d..a35036237c 100644 --- 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 27e7ffd1ab..60c50b0729 100644 --- 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 a679e16f6e..47fb55584a 100644 --- 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 99c5ddcb6a..9177407c76 100644 --- 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 */ -- 2.39.5