Enable features that were hidden behind LDAP_DEVEL

diff --git a/include/ldap.h b/include/ldap.h
index 97ca524d7509370761a71aca922321f0e8b66bec..acf6328e898a71dc092e819d4ece3c7e74413e86 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -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 */

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index cbf73bdd5a5e438d372e697b1c42dcbd45922969..e98d58b1aabf5dda531c1eefdc7bab57625a7361 100644 (file)
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -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

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index ee9deb24bc09b003e4d0a40c6aa8cbba55ec49ac..958b52c716e3f4b858e2f5c6aba7b4357956bc59 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -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)

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 97497221fb5460dae5837c7aaca8e727d16e7a2c..82cdf7a0c9cbac373355604112048dddd28af4c6 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -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;

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index f7643e70a65eedbf6042af1a0fe1d798ea65faeb..ed70c636d45297d508ae66607ee4b92d5ebd8c3f 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -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
 

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 0b49767b0b9b0c1d848224435e50c1c79deb97b0..df55b7580dfd81323e5f1b6a3303d7699b1f023c 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -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,

diff --git a/servers/slapd/back-mdb/back-mdb.h b/servers/slapd/back-mdb/back-mdb.h
index 19b0a7fd242409ed29e59615931c806f62a2ba4b..0ffeaa7ed5fa30e195f735e9e402e48e613d273b 100644 (file)
--- a/servers/slapd/back-mdb/back-mdb.h
+++ b/servers/slapd/back-mdb/back-mdb.h
@@ -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;

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index 341c05571a800954ecc58de1f4d55919a81d89ce..a79b4b6f2148d3c57ff4c8a3c983183f69b26f3a 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -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"
 

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 4a50e8cb199c0608b2444bf12bf19f8aa8dcbec3..1768ab799dff337aae6da3e423f8f6d1789f96a0 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -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;

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 8f077e5c40e2c43d6610e7840ec68ba9e9d33721..dfd7a8056e8b3ae75f47202c5ec983f0dae87f3a 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -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);

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 1fa8d1ede429d10ce96fb3f1faf6c5f0ab386083..8356e49bc332a5ec3df75a7182bf2be36b4ac305 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -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 */

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index dd8229fcba520ea1c97537361279429e16c25ef5..c18e16483db9faa64126b403084d6d762b3a6a22 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -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 {

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ccf3384aa6392470e27cdd04291fb6e86e931d5d..f7a00735d2da23a3d052083c0bf625edb34668dc 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -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;

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 195b52cfb9560a9123b3128db741cfdb90359dc8..e8112e61705a2a1bdceee9636d4faff8aea48477 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -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;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 4b3bbd12e39cb378b9ee615999b9fe217b456610..3326e3a57c5f94760b4aceeeaaea3380ef080ce4 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -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 */