Commit b14759b7 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Enable features that were hidden behind LDAP_DEVEL

parent 544d1ddd
......@@ -422,13 +422,11 @@ typedef struct ldapcontrol {
#define LDAP_URLEXT_X_SEARCHEDSUBTREE "x-searchedSubtree"
#define LDAP_URLEXT_X_FAILEDNAME "x-failedName"
#ifdef LDAP_DEVEL
#define LDAP_X_TXN "1.3.6.1.4.1.4203.666.11.7" /* tmp */
#define LDAP_EXOP_X_TXN_START LDAP_X_TXN ".1"
#define LDAP_CONTROL_X_TXN_SPEC LDAP_X_TXN ".2"
#define LDAP_EXOP_X_TXN_END LDAP_X_TXN ".3"
#define LDAP_EXOP_X_TXN_ABORTED_NOTICE LDAP_X_TXN ".4"
#endif
/* LDAP Features */
#define LDAP_FEATURE_ALL_OP_ATTRS "1.3.6.1.4.1.4203.1.5.1" /* RFC 3673 */
......
......@@ -43,9 +43,7 @@ static tls_impl *tls_imp = &ldap_int_tls_impl;
#endif /* HAVE_TLS */
#ifdef LDAP_DEVEL
#define LDAP_USE_NON_BLOCKING_TLS
#endif /* LDAP_DEVEL */
/* RFC2459 minimum required set of supported attribute types
* in a certificate DN
......
......@@ -70,17 +70,12 @@ extern int h_errno;
/* USE_GMTIME_R and USE_LOCALTIME_R defined in ldap_pvt.h */
#ifdef LDAP_DEVEL
/* to be released with 2.5 */
#if !defined( USE_GMTIME_R ) || !defined( USE_LOCALTIME_R )
/* we use the same mutex for gmtime(3) and localtime(3)
* because implementations may use the same buffer
* for both functions */
static ldap_pvt_thread_mutex_t ldap_int_gmtime_mutex;
#endif
#else /* ! LDAP_DEVEL */
ldap_pvt_thread_mutex_t ldap_int_gmtime_mutex;
#endif /* ! LDAP_DEVEL */
# if defined(HAVE_GETHOSTBYNAME_R) && \
(GETHOSTBYNAME_R_NARGS < 5) || (6 < GETHOSTBYNAME_R_NARGS)
......
......@@ -158,9 +158,7 @@ struct bdb_db_pgsize {
int bdp_size;
};
#ifdef LDAP_DEVEL
#define BDB_MONITOR_IDX
#endif /* LDAP_DEVEL */
typedef struct bdb_monitor_t {
void *bdm_cb;
......
......@@ -37,9 +37,7 @@
#define LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ "2.16.840.1.113730.3.4.12"
#ifdef LDAP_DEVEL
#define SLAP_AUTH_DN 1
#endif
#if LDAP_BACK_PRINT_CONNTREE > 0
......
......@@ -958,7 +958,6 @@ distproc_initialize( void )
return rc;
}
#ifdef LDAP_DEVEL
rc = supported_feature_load( &slap_FEATURE_CANCHAINOPS );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
......@@ -966,7 +965,6 @@ distproc_initialize( void )
rc, 0, 0 );
return rc;
}
#endif
rc = register_supported_control( LDAP_CONTROL_X_RETURNCONTREF,
SLAP_CTRL_GLOBAL|SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE, NULL,
......
......@@ -47,9 +47,7 @@ LDAP_BEGIN_DECL
/* Default to 10MB max */
#define DEFAULT_MAPSIZE (10*1048576)
#ifdef LDAP_DEVEL
#define MDB_MONITOR_IDX
#endif /* LDAP_DEVEL */
typedef struct mdb_monitor_t {
void *mdm_cb;
......
......@@ -27,9 +27,7 @@
#ifndef SLAPD_META_H
#define SLAPD_META_H
#ifdef LDAP_DEVEL
#define SLAPD_META_CLIENT_PR 1
#endif /* LDAP_DEVEL */
#include "proto-meta.h"
......
......@@ -35,9 +35,7 @@
#include "../back-ldap/back-ldap.h"
#include "back-meta.h"
#ifdef LDAP_DEVEL
#define SLAP_AUTH_DN 1
#endif
static ConfigDriver meta_back_cf_gen;
static ConfigLDAPadd meta_ldadd;
......
......@@ -2348,9 +2348,6 @@ int accesslog_initialize()
0, 0, 0 );
return -1;
}
#ifndef LDAP_DEVEL
(*lattrs[i].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
#endif
}
for ( i=0; locs[i].ot; i++ ) {
......@@ -2363,9 +2360,6 @@ int accesslog_initialize()
0, 0, 0 );
return -1;
}
#ifndef LDAP_DEVEL
(*locs[i].oc)->soc_flags |= SLAP_OC_HIDE;
#endif
}
return overlay_register(&accesslog);
......
......@@ -37,7 +37,6 @@
#include "config.h"
#ifdef LDAP_DEVEL
/*
* Control that allows to access the private DB
* instead of the public one
......@@ -53,7 +52,6 @@
* Monitoring
*/
#define PCACHE_MONITOR
#endif
/* query cache structs */
/* query */
......
......@@ -28,9 +28,7 @@
#include "config.h"
#include "ldap_rq.h"
#ifdef LDAP_DEVEL
#define CHECK_CSN 1
#endif
/* A modify request on a particular entry */
typedef struct modinst {
......
......@@ -2071,11 +2071,6 @@ LDAP_SLAPD_V (int) slap_tool_thread_max;
LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) entry2str_mutex;
#ifndef LDAP_DEVEL
/* to be removed with 2.5 */
#define gmtime_mutex ldap_int_gmtime_mutex
#endif /* ! LDAP_DEVEL */
LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) ad_index_mutex;
LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) ad_undef_mutex;
LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) oc_undef_mutex;
......
......@@ -35,9 +35,7 @@ static struct berval builtin_supportedFeatures[] = {
BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS), /* Language Range Options */
#ifdef LDAP_DEVEL
BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
#endif
BER_BVNULL
};
static struct berval *supportedFeatures;
......
......@@ -58,7 +58,6 @@
LDAP_BEGIN_DECL
#ifdef LDAP_DEVEL
#define LDAP_COLLECTIVE_ATTRIBUTES
#define LDAP_COMP_MATCH
#define LDAP_SYNC_TIMESTAMP
......@@ -68,7 +67,6 @@ LDAP_BEGIN_DECL
#ifndef SLAP_SCHEMA_EXPOSE
#define SLAP_SCHEMA_EXPOSE
#endif
#endif
#define LDAP_DYNAMIC_OBJECTS
#define SLAP_CONTROL_X_TREE_DELETE LDAP_CONTROL_X_TREE_DELETE
......@@ -2994,9 +2992,7 @@ struct Listener {
ber_socket_t sl_sd;
Sockaddr sl_sa;
#define sl_addr sl_sa.sa_in_addr
#ifdef LDAP_DEVEL
#define LDAP_TCP_BUFFER
#endif
#ifdef LDAP_TCP_BUFFER
int sl_tcp_rmem; /* custom TCP read buffer size */
int sl_tcp_wmem; /* custom TCP write buffer size */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment