ITS#6435

diff --git a/CHANGES b/CHANGES
index 286d3077d6aa62931badd30f20b5c54bab5d515e..f79b673ff3db320ac4705bc85f0f0a798d8f8c49 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,18 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.22 Engineering
+       Added slapd SLAP_SCHEMA_EXPOSE flag for hidden schema elements (ITS#6435)
+       Fixed slapd REP_ENTRY flag handling (ITS#5340)
+       Fixed slapo-collect REP_ENTRY flag handling (ITS#5340,ITS#6423)
+       Fixed slapo-dynlist REP_ENTRY flag handling (ITS#5340,ITS#6423)
+       Fixed slapo-rwm olcRwmMap handling (ITS#6434)
+       Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
+       Fixed slapo-valsort REP_ENTRY flag handling (ITS#5340,ITS#6423)
 
 OpenLDAP 2.4.21 Release (2009/12/20)
        Fixed liblutil for negative microsecond offsets (ITS#6405)
        Fixed slapd global settings to work without restart (ITS#6428)
        Fixed slapd looping with SSL/TLS connections (ITS#6412)
-       Fixed slapd REP_ENTRY flag handling (ITS#5340)
        Fixed slapd syncrepl freeing tasks from queue (ITS#6413)
        Fixed slapd syncrepl parsing of tls defaults (ITS#6419)
        Fixed slapd syncrepl uninitialized variables (ITS#6425)
@@ -14,13 +20,8 @@ OpenLDAP 2.4.21 Release (2009/12/20)
        Fixed slapo-dynlist behavior with simple filters (ITS#6421)
        Fixed slapd-ldif access outside database directory (ITS#6414)
        Fixed slapd-null extraneous assert (ITS#6403)
-       Fixed slapo-collect REP_ENTRY flag handling (ITS#5340,ITS#6423)
-       Fixed slapo-dynlist REP_ENTRY flag handling (ITS#5340,ITS#6423)
-       Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
-       Fixed slapo-rwm olcRwmMap handling (ITS#6434)
        Fixed slapo-translucent with back-null (ITS#6403)
        Fixed slapo-unique criteria checking (ITS#6270)
-       Fixed slapo-valsort REP_ENTRY flag handling (ITS#5340,ITS#6423)
        Build Environment
                Deleted broken LBER_INVALID macro (ITS#6402)
                Fixed test058 kill usage (ITS#6420)

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 56e1768170d5696ba773204ef667762668f56689..a02991cd419b33de40998a8582a5e2d4c54ef9b2 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -65,6 +65,9 @@ LDAP_BEGIN_DECL
 #define SLAP_CONTROL_X_SESSION_TRACKING
 #define SLAP_CONTROL_X_WHATFAILED
 #define SLAP_CONFIG_DELETE
+#ifndef SLAP_SCHEMA_EXPOSE
+#define SLAP_SCHEMA_EXPOSE
+#endif
 #endif
 
 #define LDAP_DYNAMIC_OBJECTS
@@ -412,7 +415,7 @@ struct Syntax {
 #define SLAP_SYNTAX_BLOB       0x0001U /* syntax treated as blob (audio) */
 #define SLAP_SYNTAX_BINARY     0x0002U /* binary transfer required (certificate) */
 #define SLAP_SYNTAX_BER                0x0004U /* stored in BER encoding (certificate) */
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_SYNTAX_HIDE       0x0000U /* publish everything */
 #else
 #define SLAP_SYNTAX_HIDE       0x8000U /* hide (do not publish) */
@@ -519,7 +522,7 @@ struct MatchingRule {
 
        slap_mask_t                     smr_usage;
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_MR_HIDE                   0x0000U
 #else
 #define SLAP_MR_HIDE                   0x8000U
@@ -690,7 +693,7 @@ struct AttributeType {
 #define SLAP_AT_NONE                   0x0000U
 #define SLAP_AT_ABSTRACT               0x0100U /* cannot be instantiated */
 #define SLAP_AT_FINAL                  0x0200U /* cannot be subtyped */
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_AT_HIDE                   0x0000U /* publish everything */
 #else
 #define SLAP_AT_HIDE                   0x8000U /* hide attribute */
@@ -788,7 +791,7 @@ struct ObjectClass {
 #define        SLAP_OC__MASK           0x00FF
 #define        SLAP_OC__END            0x0100
 #define SLAP_OC_OPERATIONAL    0x4000
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_OC_HIDE           0x0000
 #else
 #define SLAP_OC_HIDE           0x8000
@@ -2011,7 +2014,7 @@ typedef struct req_abandon_s {
        ber_int_t rs_msgid;
 } req_abandon_s;
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_EXOP_HIDE 0x0000
 #else
 #define SLAP_EXOP_HIDE 0x8000
@@ -2970,7 +2973,7 @@ struct Listener {
 /* number of response controls supported */
 #define SLAP_MAX_RESPONSE_CONTROLS   6
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SCHEMA_EXPOSE
 #define SLAP_CTRL_HIDE                         0x00000000U
 #else
 #define SLAP_CTRL_HIDE                         0x80000000U