upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some LDAP_DEVEL cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2006-08-15 19:36:54 +00:00
parent 44d3972dd7
commit d9720d50dd
10 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/acl.c
View file

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

2
servers/slapd/back-dnssrv/referral.c
View file

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

2
servers/slapd/back-dnssrv/search.c
View file

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

7
servers/slapd/back-ldap/distproc.c
View file

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

2
servers/slapd/back-ldap/init.c
View file

@ -84,7 +84,7 @@ ldap_back_initialize( BackendInfo *bi )
return -1;
}
#ifdef LDAP_DEVEL
#ifdef SLAP_DISTPROC
if ( distproc_initialize() ) {
return -1;
}

2
servers/slapd/back-ldap/proto-ldap.h
View file

@ -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

4
servers/slapd/back-monitor/conn.c
View file

@ -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,

10
servers/slapd/extended.c
View file

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

2
servers/slapd/overlays/dynlist.c
View file

@ -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

1
servers/slapd/slap.h
View file

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