ITS#5383

diff --git a/CHANGES b/CHANGES
index 493091f0501546e84926ce81507d16ebf55ca513..1d6abcbf873e84fc415a65ebf3424834121bbfa6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed slapd/slapo-accesslog rq mutex usage (ITS#5442)
        Fixed slapd-bdb ID_NOCACHE handling (ITS#5439)
        Fixed slapd-bdb entryinfo state if db_lock fails (ITS#5455)
+       Fixed slapd-config attribute publishing (ITS#5383)
        Fixed slapd-ldap connection handler (ITS#5404)
        Fixed slapo-auditlog unnecessary syscall (ITS#5441)
        Fixed slapo-refint dnSubtreeMatch (ITS#5427)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index b65928e9a89deb91201df8484cf31085ecab959d..e2486ca65260476265431baa79938b45baaab02c 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -189,8 +189,8 @@ typedef struct {
 } OidRec;
 
 static OidRec OidMacros[] = {
-       /* OpenLDAProot:666.11.1 */
-       { "OLcfg", "1.3.6.1.4.1.4203.666.11.1" },
+       /* OpenLDAProot:1.12.2 */
+       { "OLcfg", "1.3.6.1.4.1.4203.1.12.2" },
        { "OLcfgAt", "OLcfg:3" },
        { "OLcfgGlAt", "OLcfgAt:0" },
        { "OLcfgBkAt", "OLcfgAt:1" },

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index f2b624fb4e7ccdb95044ddc92e74a9d80b875299..368fb9cef62c883dc787c326587b274d98285cb2 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -496,9 +496,6 @@ init_config_attrs(ConfigTable *ct) {
                        fprintf( stderr, "init_config_attrs: register_at failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ct[i].ad->ad_type->sat_flags |= SLAP_AT_HIDE;
-#endif
        }
 
        return 0;
@@ -514,9 +511,6 @@ init_config_ocs( ConfigOCs *ocs ) {
                        fprintf( stderr, "init_config_ocs: register_oc failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ocs[i].co_oc->soc_flags |= SLAP_OC_HIDE;
-#endif
        }
        return 0;
 }