Use OLcfgCt{Oc|At} arc for contrib modules

diff --git a/contrib/ConfigOIDs b/contrib/ConfigOIDs
new file mode 100644 (file)
index 0000000..e397f23
--- /dev/null
+++ b/contrib/ConfigOIDs
@@ -0,0 +1,3 @@
+List of OpenLDAP Configuration OIDs allocated to contrib modules
+
+OLcfgCt{Oc|At}:1       smbk5pwd

diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
index dabf6e782a376f47957b8de045e3d483075fe5d4..2262a44cecc8a36c758563898f53fb1964023a7b 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
@@ -604,23 +604,23 @@ enum {
 static ConfigDriver smbk5pwd_cf_func;
 
 /*
- * NOTE: uses OID arcs OLcfgOvAt:6 and OLcfgOvOc:6
+ * NOTE: uses OID arcs OLcfgCtAt:1 and OLcfgCtOc:1
  */
 
 static ConfigTable smbk5pwd_cfats[] = {
        { "smbk5pwd-enable", "arg",
                2, 0, 0, ARG_MAGIC|PC_SMB_ENABLE, smbk5pwd_cf_func,
-               "( OLcfgOvAt:6.1 NAME 'olcSmbK5PwdEnable' "
+               "( OLcfgCtAt:1.1 NAME 'olcSmbK5PwdEnable' "
                "DESC 'Modules to be enabled' "
                "SYNTAX OMsDirectoryString )", NULL, NULL },
        { "smbk5pwd-must-change", "time",
                2, 2, 0, ARG_MAGIC|ARG_INT|PC_SMB_MUST_CHANGE, smbk5pwd_cf_func,
-               "( OLcfgOvAt:6.2 NAME 'olcSmbK5PwdMustChange' "
+               "( OLcfgCtAt:1.2 NAME 'olcSmbK5PwdMustChange' "
                "DESC 'Credentials validity interval' "
                "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
         { "smbk5pwd-can-change", "time",
                 2, 2, 0, ARG_MAGIC|ARG_INT|PC_SMB_CAN_CHANGE, smbk5pwd_cf_func,
-                "( OLcfgOvAt:6.3 NAME 'olcSmbK5PwdCanChange' "
+                "( OLcfgCtAt:1.3 NAME 'olcSmbK5PwdCanChange' "
                 "DESC 'Credentials minimum validity interval' "
                 "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
 
@@ -628,7 +628,7 @@ static ConfigTable smbk5pwd_cfats[] = {
 };
 
 static ConfigOCs smbk5pwd_cfocs[] = {
-       { "( OLcfgOvOc:6.1 "
+       { "( OLcfgCtOc:1.1 "
                "NAME 'olcSmbK5PwdConfig' "
                "DESC 'smbk5pwd overlay configuration' "
                "SUP olcOverlayConfig "

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index d417ae18d756459ee31c88b48ebb6d35dfaba31c..6a6e56d61f4f28acc943c92c712edef099494c5d 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -193,11 +193,13 @@ static OidRec OidMacros[] = {
        { "OLcfgBkAt", "OLcfgAt:1" },
        { "OLcfgDbAt", "OLcfgAt:2" },
        { "OLcfgOvAt", "OLcfgAt:3" },
+       { "OLcfgCtAt", "OLcfgAt:4" },   /* contrib modules */
        { "OLcfgOc", "OLcfg:4" },
        { "OLcfgGlOc", "OLcfgOc:0" },
        { "OLcfgBkOc", "OLcfgOc:1" },
        { "OLcfgDbOc", "OLcfgOc:2" },
        { "OLcfgOvOc", "OLcfgOc:3" },
+       { "OLcfgCtOc", "OLcfgOc:4" },   /* contrib modules */
 
        /* Syntaxes. We should just start using the standard names and
         * document that they are predefined and available for users
@@ -235,8 +237,6 @@ static OidRec OidMacros[] = {
  * OLcfgOv{Oc|At}:3                    -> chain
  * OLcfgOv{Oc|At}:4                    -> accesslog
  * OLcfgOv{Oc|At}:5                    -> valsort
- * (FIXME: separate arc for contribware?)
- * OLcfgOv{Oc|At}:6                    -> smbk5pwd
  * OLcfgOv{Oc|At}:7                    -> distproc
  * OLcfgOv{Oc|At}:8                    -> dynlist
  * OLcfgOv{Oc|At}:9                    -> dds