hide (experimental) schema

diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c
index ffde364a270893baae2427d8c1705e33066fcd10..c99204a65743552ac8f58748e50b4ef393151f0d 100644 (file)
--- a/servers/slapd/back-bdb/monitor.c
+++ b/servers/slapd/back-bdb/monitor.c
@@ -279,6 +279,7 @@ bdb_monitor_initialize( void )
                                "bdb_monitor_initialize: register_at failed\n",
                                0, 0, 0 );
                }
+               (*s_at[ i ].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
        }
 
        for ( i = 0; s_oc[ i ].desc != NULL; i++ ) {
@@ -288,6 +289,7 @@ bdb_monitor_initialize( void )
                                "bdb_monitor_initialize: register_oc failed\n",
                                0, 0, 0 );
                }
+               (*s_oc[ i ].oc)->soc_flags |= SLAP_OC_HIDE;
        }
 
        return 0;

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 278658eb58f93c214c7efad0aa77d2507effee16..1df2ccd7bbbc061464daa80e7f2ac90a9328ccb2 100644 (file)
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -1842,6 +1842,7 @@ dds_initialize()
        if ( !do_not_load_schema ) {
                static struct {
                        char                    *desc;
+                       slap_mask_t             flags;
                        AttributeDescription    **ad;
                }               s_at[] = {
                        { "( 1.3.6.1.4.1.4203.666.1.57 "
@@ -1854,6 +1855,7 @@ dds_initialize()
                                "SINGLE-VALUE "
                                "NO-USER-MODIFICATION "
                                "USAGE dSAOperation )",
+                               SLAP_AT_HIDE,
                                &ad_entryExpireTimestamp },
                        { NULL }
                };
@@ -1865,6 +1867,7 @@ dds_initialize()
                                        "dds_initialize: register_at failed\n", 0, 0, 0 );
                                return code;
                        }
+                       (*s_at[ i ].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
                }
        }
 

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index ae3690c652df3aceda51945b3524b8da4d868f8b..58c5e1e81e49dba813b056f372227a7926e8bcb3 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -3727,6 +3727,7 @@ pcache_initialize()
                                "pcache_initialize: register_at #%d failed\n", i, 0, 0 );
                        return code;
                }
+               (*as[i].adp)->ad_type->sat_flags |= SLAP_AT_HIDE;
        }
 
        pcache.on_bi.bi_type = "pcache";

diff --git a/servers/slapd/overlays/retcode.c b/servers/slapd/overlays/retcode.c
index 9b7c2cd35cfa0ad080c1a3993e87f514ced67e2a..e7639befa832952fb013629c4acfc3d3f8519a67 100644 (file)
--- a/servers/slapd/overlays/retcode.c
+++ b/servers/slapd/overlays/retcode.c
@@ -1374,9 +1374,7 @@ retcode_initialize( void )
                        return code;
                }
 
-#ifndef LDAP_DEVEL
                (*retcode_at[ i ].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
-#endif /* LDAP_DEVEL */
        }
 
        for ( i = 0; retcode_oc[ i ].desc != NULL; i++ ) {
@@ -1387,9 +1385,7 @@ retcode_initialize( void )
                        return code;
                }
 
-#ifndef LDAP_DEVEL
                (*retcode_oc[ i ].oc)->soc_flags |= SLAP_OC_HIDE;
-#endif /* LDAP_DEVEL */
        }
 
        retcode.on_bi.bi_type = "retcode";

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 2cb1ce23494604c82dd0dcc5f3e82ccb30558885..7d0114a795b32dd679ec0045770892c663901181 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -5181,7 +5181,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
 
        {"( 1.3.6.1.4.1.4203.666.11.2.5 NAME 'CSNSIDMatch' "
                "SYNTAX 1.3.6.1.4.1.4203.666.11.2.4 )",
-               SLAP_MR_EQUALITY | SLAP_MR_EXT, csnSIDMatchSyntaxes,
+               SLAP_MR_HIDE | SLAP_MR_EQUALITY | SLAP_MR_EXT, csnSIDMatchSyntaxes,
                NULL, csnSidNormalize, octetStringMatch,
                octetStringIndexer, octetStringFilter,
                NULL },