From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 26 Sep 2017 18:35:50 +0000 (-0700)
Subject: Move a bunch of featuers back behind LDAP_DEVEL for 2.5
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=30e2a904dcdb857dcb480aab817a8a677b2bf6c5

Move a bunch of featuers back behind LDAP_DEVEL for 2.5
SLAP_AUXPROP_DONTUSECOPY is ok for release
---

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index ede7b793da..e13880fb09 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -58,17 +58,19 @@
 
 LDAP_BEGIN_DECL
 
+#ifdef LDAP_DEVEL
 #define LDAP_COLLECTIVE_ATTRIBUTES
 #define LDAP_COMP_MATCH
 #define LDAP_SYNC_TIMESTAMP
 #define SLAP_CONTROL_X_WHATFAILED
 #define SLAP_CONTROL_X_LAZY_COMMIT
 #define SLAP_CONFIG_DELETE
-#define SLAP_AUXPROP_DONTUSECOPY
 #ifndef SLAP_SCHEMA_EXPOSE
 #define SLAP_SCHEMA_EXPOSE
 #endif
+#endif
 
+#define SLAP_AUXPROP_DONTUSECOPY
 #define LDAP_DYNAMIC_OBJECTS
 #define SLAP_CONTROL_X_TREE_DELETE LDAP_CONTROL_X_TREE_DELETE
 #define SLAP_CONTROL_X_SESSION_TRACKING