From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 15 Apr 2008 00:20:28 +0000 (+0000)
Subject: ITS#5383
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=39210fd04624d813472a502618e011eb72875330;p=openldap

ITS#5383
---

diff --git a/CHANGES b/CHANGES
index 493091f050..1d6abcbf87 100644
--- 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 b65928e9a8..e2486ca652 100644
--- 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 f2b624fb4e..368fb9cef6 100644
--- 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;
 }