From 27040745e83d5712ed3a2774a435065b32b70f0b Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 1 Sep 2007 15:59:14 +0000 Subject: [PATCH] hide (experimental) schema --- servers/slapd/back-bdb/monitor.c | 2 ++ servers/slapd/overlays/dds.c | 3 +++ servers/slapd/overlays/pcache.c | 1 + servers/slapd/overlays/retcode.c | 4 ---- servers/slapd/schema_init.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c index ffde364a27..c99204a657 100644 --- 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 278658eb58..1df2ccd7bb 100644 --- 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 ae3690c652..58c5e1e81e 100644 --- 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 9b7c2cd35c..e7639befa8 100644 --- 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 2cb1ce2349..7d0114a795 100644 --- 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 }, -- 2.39.5