ITS#10103 Fix contrib module OIDs

diff --git a/contrib/ConfigOIDs b/contrib/ConfigOIDs
index 6dd4a9a4a10f7a96558a4db6e8b8b4a8bbb73418..fc76af6b0817f07b0b2636dbf146af702037f90b 100644 (file)
--- a/contrib/ConfigOIDs
+++ b/contrib/ConfigOIDs
@@ -6,3 +6,6 @@ OLcfgCt{Oc|At}:3        nssov
 OLcfgCt{Oc|At}:4       cloak
 OLcfgCt{Oc|At}:5       lastbind
 OLcfgCt{Oc|At}:6       adremap
+OLcfgCt{Oc|At}:7       rbac
+OLcfgCt{Oc|At}:8       datamorph
+OLcfgCt{Oc|At}:9       variant

diff --git a/contrib/slapd-modules/datamorph/datamorph.c b/contrib/slapd-modules/datamorph/datamorph.c
index c0a5f8069ee5a8fd24c26ba4f6379d3fec622aa6..a76f9704834c07cd7a41e9a2a57658e0a3986c7a 100644 (file)
--- a/contrib/slapd-modules/datamorph/datamorph.c
+++ b/contrib/slapd-modules/datamorph/datamorph.c
@@ -1194,7 +1194,7 @@ static ConfigTable datamorph_cfg[] = {
        { "datamorph_attribute", "attr", 2, 2, 0,
                ARG_STRING|ARG_QUOTE|ARG_MAGIC,
                datamorph_set_attribute,
-               "( OLcfgCtAt:7.1 NAME 'olcDatamorphAttribute' "
+               "( OLcfgCtAt:8.1 NAME 'olcDatamorphAttribute' "
                        "DESC 'Attribute to transform' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -1204,7 +1204,7 @@ static ConfigTable datamorph_cfg[] = {
        { "datamorph_size", "<1|2|4|8>", 2, 2, 0,
                ARG_INT|ARG_MAGIC|DATAMORPH_INT_SIZE,
                datamorph_set_size,
-               "( OLcfgCtAt:7.2 NAME 'olcDatamorphIntegerBytes' "
+               "( OLcfgCtAt:8.2 NAME 'olcDatamorphIntegerBytes' "
                        "DESC 'Integer size in bytes' "
                        "EQUALITY integerMatch "
                        "SYNTAX OMsInteger "
@@ -1214,7 +1214,7 @@ static ConfigTable datamorph_cfg[] = {
        { "datamorph_signed", "TRUE|FALSE", 2, 2, 0,
                ARG_ON_OFF|ARG_MAGIC|DATAMORPH_INT_SIGNED,
                datamorph_set_signed,
-               "( OLcfgCtAt:7.3 NAME 'olcDatamorphIntegerSigned' "
+               "( OLcfgCtAt:8.3 NAME 'olcDatamorphIntegerSigned' "
                        "DESC 'Whether integers maintain sign' "
                        "EQUALITY booleanMatch "
                        "SYNTAX OMsBoolean "
@@ -1224,7 +1224,7 @@ static ConfigTable datamorph_cfg[] = {
        { "datamorph_lower_bound", "int", 2, 2, 0,
                ARG_BERVAL|ARG_MAGIC|DATAMORPH_INT_LOWER,
                datamorph_set_bounds,
-               "( OLcfgCtAt:7.4 NAME 'olcDatamorphIntegerLowerBound' "
+               "( OLcfgCtAt:8.4 NAME 'olcDatamorphIntegerLowerBound' "
                        "DESC 'Lowest valid value for the attribute' "
                        "EQUALITY integerMatch "
                        "SYNTAX OMsInteger "
@@ -1234,7 +1234,7 @@ static ConfigTable datamorph_cfg[] = {
        { "datamorph_upper_bound", "int", 2, 2, 0,
                ARG_BERVAL|ARG_MAGIC|DATAMORPH_INT_UPPER,
                datamorph_set_bounds,
-               "( OLcfgCtAt:7.5 NAME 'olcDatamorphIntegerUpperBound' "
+               "( OLcfgCtAt:8.5 NAME 'olcDatamorphIntegerUpperBound' "
                        "DESC 'Highest valid value for the attribute' "
                        "EQUALITY integerMatch "
                        "SYNTAX OMsInteger "
@@ -1246,7 +1246,7 @@ static ConfigTable datamorph_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_INT|ARG_MAGIC,
                datamorph_set_index,
-               "( OLcfgCtAt:7.6 NAME 'olcDatamorphIndex' "
+               "( OLcfgCtAt:8.6 NAME 'olcDatamorphIndex' "
                        "DESC 'Internal DB value' "
                        "EQUALITY integerMatch "
                        "SYNTAX OMsInteger "
@@ -1256,7 +1256,7 @@ static ConfigTable datamorph_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_BERVAL|ARG_QUOTE|ARG_MAGIC,
                datamorph_set_value,
-               "( OLcfgCtAt:7.7 NAME 'olcDatamorphValue' "
+               "( OLcfgCtAt:8.7 NAME 'olcDatamorphValue' "
                        "DESC 'Wire value' "
                        "EQUALITY caseExactMatch "
                        "SYNTAX OMsDirectoryString "
@@ -1282,25 +1282,25 @@ static ConfigTable datamorph_cfg[] = {
 };
 
 static ConfigOCs datamorph_ocs[] = {
-       { "( OLcfgCtOc:7.1 "
+       { "( OLcfgCtOc:8.1 "
                "NAME 'olcDatamorphConfig' "
                "DESC 'Datamorph overlay configuration' "
                "SUP olcOverlayConfig )",
                Cft_Overlay, datamorph_cfg, NULL, datamorph_cfadd },
-       { "( OLcfgCtOc:7.2 "
+       { "( OLcfgCtOc:8.2 "
                "NAME 'olcTransformation' "
                "DESC 'Transformation configuration' "
                "MUST ( olcDatamorphAttribute ) "
                "SUP top "
                "ABSTRACT )",
                Cft_Misc, datamorph_cfg, NULL },
-       { "( OLcfgCtOc:7.3 "
+       { "( OLcfgCtOc:8.3 "
                "NAME 'olcDatamorphEnum' "
                "DESC 'Configuration for an enumerated attribute' "
                "SUP olcTransformation "
                "STRUCTURAL )",
                Cft_Misc, datamorph_cfg, datamorph_ldadd_enum },
-       { "( OLcfgCtOc:7.4 "
+       { "( OLcfgCtOc:8.4 "
                "NAME 'olcDatamorphInteger' "
                "DESC 'Configuration for a compact integer attribute' "
                "MUST ( olcDatamorphIntegerBytes ) "
@@ -1311,7 +1311,7 @@ static ConfigOCs datamorph_ocs[] = {
                "SUP olcTransformation "
                "STRUCTURAL )",
                Cft_Misc, datamorph_cfg, datamorph_ldadd_interval },
-       { "( OLcfgCtOc:7.5 "
+       { "( OLcfgCtOc:8.5 "
                "NAME 'olcDatamorphEnumValue' "
                "DESC 'Configuration for an enumerated attribute' "
                "MUST ( olcDatamorphIndex $ "

diff --git a/contrib/slapd-modules/variant/variant.c b/contrib/slapd-modules/variant/variant.c
index cbc2ce260efe62ed804dc59e5ec7beda1de6dfbe..037c719027014bbdae845b4e0a1e206c8b85d4d7 100644 (file)
--- a/contrib/slapd-modules/variant/variant.c
+++ b/contrib/slapd-modules/variant/variant.c
@@ -696,7 +696,7 @@ static ConfigTable variant_cfg[] = {
        { "passReplication", "on|off", 2, 2, 0,
                ARG_ON_OFF|ARG_OFFSET,
                (void *)offsetof( variant_info_t, passReplication ),
-               "( OLcfgOvAt:FIXME.1 NAME 'olcVariantPassReplication' "
+               "( OLcfgOvAt:9.1 NAME 'olcVariantPassReplication' "
                        "DESC 'Whether to let searches with replication control "
                                "pass unmodified' "
                        "SYNTAX OMsBoolean "
@@ -706,7 +706,7 @@ static ConfigTable variant_cfg[] = {
        { "variantDN", "dn", 2, 2, 0,
                ARG_DN|ARG_QUOTE|ARG_MAGIC,
                variant_set_dn,
-               "( OLcfgOvAt:FIXME.2 NAME 'olcVariantEntry' "
+               "( OLcfgOvAt:9.2 NAME 'olcVariantEntry' "
                        "DESC 'DN of the variant entry' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX OMsDN "
@@ -716,7 +716,7 @@ static ConfigTable variant_cfg[] = {
        { "variantRegex", "regex", 2, 2, 0,
                ARG_BERVAL|ARG_QUOTE|ARG_MAGIC,
                variant_set_regex,
-               "( OLcfgOvAt:FIXME.6 NAME 'olcVariantEntryRegex' "
+               "( OLcfgOvAt:9.6 NAME 'olcVariantEntryRegex' "
                        "DESC 'Pattern for the variant entry' "
                        "EQUALITY caseExactMatch "
                        "SYNTAX OMsDirectoryString "
@@ -727,7 +727,7 @@ static ConfigTable variant_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_STRING|ARG_MAGIC|VARIANT_ATTR,
                variant_set_attribute,
-               "( OLcfgOvAt:FIXME.3 NAME 'olcVariantVariantAttribute' "
+               "( OLcfgOvAt:9.3 NAME 'olcVariantVariantAttribute' "
                        "DESC 'Attribute to fill in the entry' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -737,7 +737,7 @@ static ConfigTable variant_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_STRING|ARG_MAGIC|VARIANT_ATTR_ALT,
                variant_set_attribute,
-               "( OLcfgOvAt:FIXME.4 NAME 'olcVariantAlternativeAttribute' "
+               "( OLcfgOvAt:9.4 NAME 'olcVariantAlternativeAttribute' "
                        "DESC 'Attribute to take from the alternative entry' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -747,7 +747,7 @@ static ConfigTable variant_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_DN|ARG_QUOTE|ARG_MAGIC,
                variant_set_alt_dn,
-               "( OLcfgOvAt:FIXME.5 NAME 'olcVariantAlternativeEntry' "
+               "( OLcfgOvAt:9.5 NAME 'olcVariantAlternativeEntry' "
                        "DESC 'DN of the alternative entry' "
                        "EQUALITY distinguishedNameMatch "
                        "SYNTAX OMsDN "
@@ -757,7 +757,7 @@ static ConfigTable variant_cfg[] = {
        { "", NULL, 2, 2, 0,
                ARG_BERVAL|ARG_QUOTE|ARG_MAGIC,
                variant_set_alt_pattern,
-               "( OLcfgOvAt:FIXME.7 NAME 'olcVariantAlternativeEntryPattern' "
+               "( OLcfgOvAt:9.7 NAME 'olcVariantAlternativeEntryPattern' "
                        "DESC 'Replacement pattern to locate the alternative entry' "
                        "EQUALITY caseExactMatch "
                        "SYNTAX OMsDirectoryString "
@@ -780,13 +780,13 @@ static ConfigTable variant_cfg[] = {
 };
 
 static ConfigOCs variant_ocs[] = {
-       { "( OLcfgOvOc:FIXME.1 "
+       { "( OLcfgOvOc:9.1 "
                "NAME 'olcVariantConfig' "
                "DESC 'Variant overlay configuration' "
                "SUP olcOverlayConfig "
                "MAY ( olcVariantPassReplication ) )",
                Cft_Overlay, variant_cfg, NULL, variant_cfadd },
-       { "( OLcfgOvOc:FIXME.2 "
+       { "( OLcfgOvOc:9.2 "
                "NAME 'olcVariantVariant' "
                "DESC 'Variant configuration' "
                "MUST ( olcVariantEntry ) "
@@ -794,7 +794,7 @@ static ConfigOCs variant_ocs[] = {
                "SUP top "
                "STRUCTURAL )",
                Cft_Misc, variant_cfg, variant_ldadd },
-       { "( OLcfgOvOc:FIXME.3 "
+       { "( OLcfgOvOc:9.3 "
                "NAME 'olcVariantAttribute' "
                "DESC 'Variant attribute description' "
                "MUST ( olcVariantVariantAttribute $ "
@@ -805,7 +805,7 @@ static ConfigOCs variant_ocs[] = {
                "SUP top "
                "STRUCTURAL )",
                Cft_Misc, variant_cfg, variant_attr_ldadd },
-       { "( OLcfgOvOc:FIXME.4 "
+       { "( OLcfgOvOc:9.4 "
                "NAME 'olcVariantRegex' "
                "DESC 'Variant configuration' "
                "MUST ( olcVariantEntryRegex ) "
@@ -813,7 +813,7 @@ static ConfigOCs variant_ocs[] = {
                "SUP top "
                "STRUCTURAL )",
                Cft_Misc, variant_cfg, variant_regex_ldadd },
-       { "( OLcfgOvOc:FIXME.5 "
+       { "( OLcfgOvOc:9.5 "
                "NAME 'olcVariantAttributePattern' "
                "DESC 'Variant attribute description' "
                "MUST ( olcVariantVariantAttribute $ "