ITS#5383

diff --git a/CHANGES b/CHANGES
index de48cc1e11a8b8cbe745391c3e5c6534bd3dc783..a30b0bd8b4578a4bd45185505abafa9256c0a5b7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,8 +5,9 @@ OpenLDAP 2.4.11 Engineering
        Added libldap assertion control (ITS#5560)
        Fixed libldap GnuTLS CRL result handling (ITS#5577)
        Fixed slapd check for structural_class failures (ITS#5540)
-       Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540)
+       Fixed slapd configContext OID (ITS#5383)
        Fixed slapd crash with no listeners (ITS#5563)
+       Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540)
        Fixed slapd sets memory leak (ITS#5557)
        Fixed slapd-sock, back-shell buffer count (ITS#5558)
        Added slapo-nssov contrib module

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 12bd1d9d869f09278275ddf7c275fa2cc536ef0d..74ec625e3b796b18655cb595dceabe283857bf13 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -690,7 +690,7 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_monitorContext) },
-       { "configContext", "( 1.3.6.1.4.1.4203.666.11.1.1 "
+       { "configContext", "( 1.3.6.1.4.1.4203.1.12.2.1 "
                        "NAME 'configContext' "
                        "DESC 'config context' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "