Move cloak config OID from overlay to contrib branch (ITS#5872)

diff --git a/contrib/ConfigOIDs b/contrib/ConfigOIDs
index df004580d3e31f5b2d8d83d91af3ec29cf488551..ebc1825b6c35ae45000a66e293e58e31f6be45d2 100644 (file)
--- a/contrib/ConfigOIDs
+++ b/contrib/ConfigOIDs
@@ -3,3 +3,4 @@ List of OpenLDAP Configuration OIDs allocated to contrib modules
 OLcfgCt{Oc|At}:1       smbk5pwd
 OLcfgCt{Oc|At}:2       autogroup
 OLcfgCt{Oc|At}:3       nssov
+OLcfgCt{Oc|At}:4       cloak

diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c
index a099ccecd3193125499493a79858ed5ec2424bb4..5e4f11d0e5be403f390a2111da77d2d65cdfa9bc 100644 (file)
--- a/contrib/slapd-modules/cloak/cloak.c
+++ b/contrib/slapd-modules/cloak/cloak.c
@@ -282,7 +282,7 @@ static slap_overinst cloak_ovl;
 static ConfigTable cloakcfg[] = {
        { "cloak-attr", "attribute [class]",
                2, 3, 0, ARG_MAGIC|CLOAK_ATTR, cloak_cfgen,
-               "( OLcfgOvAt:22.1 NAME 'olcCloakAttribute' "
+               "( OLcfgCtAt:4.1 NAME 'olcCloakAttribute' "
                        "DESC 'Cloaked attribute: attribute [class]' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -292,7 +292,7 @@ static ConfigTable cloakcfg[] = {
 };
 
 static ConfigOCs cloakocs[] = {
-       { "( OLcfgOvOc:22.1 "
+       { "( OLcfgCtOc:4.1 "
          "NAME 'olcCloakConfig' "
          "DESC 'Attribute cloak configuration' "
          "SUP olcOverlayConfig "