Commit 75df004a authored by Howard Chu's avatar Howard Chu
Browse files

Use OLcfgCt{Oc|At} arc for contrib modules

parent aad65553
List of OpenLDAP Configuration OIDs allocated to contrib modules
OLcfgCt{Oc|At}:1 smbk5pwd
...@@ -604,23 +604,23 @@ enum { ...@@ -604,23 +604,23 @@ enum {
static ConfigDriver smbk5pwd_cf_func; 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[] = { static ConfigTable smbk5pwd_cfats[] = {
{ "smbk5pwd-enable", "arg", { "smbk5pwd-enable", "arg",
2, 0, 0, ARG_MAGIC|PC_SMB_ENABLE, smbk5pwd_cf_func, 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' " "DESC 'Modules to be enabled' "
"SYNTAX OMsDirectoryString )", NULL, NULL }, "SYNTAX OMsDirectoryString )", NULL, NULL },
{ "smbk5pwd-must-change", "time", { "smbk5pwd-must-change", "time",
2, 2, 0, ARG_MAGIC|ARG_INT|PC_SMB_MUST_CHANGE, smbk5pwd_cf_func, 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' " "DESC 'Credentials validity interval' "
"SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL }, "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
{ "smbk5pwd-can-change", "time", { "smbk5pwd-can-change", "time",
2, 2, 0, ARG_MAGIC|ARG_INT|PC_SMB_CAN_CHANGE, smbk5pwd_cf_func, 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' " "DESC 'Credentials minimum validity interval' "
"SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL }, "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
...@@ -628,7 +628,7 @@ static ConfigTable smbk5pwd_cfats[] = { ...@@ -628,7 +628,7 @@ static ConfigTable smbk5pwd_cfats[] = {
}; };
static ConfigOCs smbk5pwd_cfocs[] = { static ConfigOCs smbk5pwd_cfocs[] = {
{ "( OLcfgOvOc:6.1 " { "( OLcfgCtOc:1.1 "
"NAME 'olcSmbK5PwdConfig' " "NAME 'olcSmbK5PwdConfig' "
"DESC 'smbk5pwd overlay configuration' " "DESC 'smbk5pwd overlay configuration' "
"SUP olcOverlayConfig " "SUP olcOverlayConfig "
......
...@@ -193,11 +193,13 @@ static OidRec OidMacros[] = { ...@@ -193,11 +193,13 @@ static OidRec OidMacros[] = {
{ "OLcfgBkAt", "OLcfgAt:1" }, { "OLcfgBkAt", "OLcfgAt:1" },
{ "OLcfgDbAt", "OLcfgAt:2" }, { "OLcfgDbAt", "OLcfgAt:2" },
{ "OLcfgOvAt", "OLcfgAt:3" }, { "OLcfgOvAt", "OLcfgAt:3" },
{ "OLcfgCtAt", "OLcfgAt:4" }, /* contrib modules */
{ "OLcfgOc", "OLcfg:4" }, { "OLcfgOc", "OLcfg:4" },
{ "OLcfgGlOc", "OLcfgOc:0" }, { "OLcfgGlOc", "OLcfgOc:0" },
{ "OLcfgBkOc", "OLcfgOc:1" }, { "OLcfgBkOc", "OLcfgOc:1" },
{ "OLcfgDbOc", "OLcfgOc:2" }, { "OLcfgDbOc", "OLcfgOc:2" },
{ "OLcfgOvOc", "OLcfgOc:3" }, { "OLcfgOvOc", "OLcfgOc:3" },
{ "OLcfgCtOc", "OLcfgOc:4" }, /* contrib modules */
/* Syntaxes. We should just start using the standard names and /* Syntaxes. We should just start using the standard names and
* document that they are predefined and available for users * document that they are predefined and available for users
...@@ -235,8 +237,6 @@ static OidRec OidMacros[] = { ...@@ -235,8 +237,6 @@ static OidRec OidMacros[] = {
* OLcfgOv{Oc|At}:3 -> chain * OLcfgOv{Oc|At}:3 -> chain
* OLcfgOv{Oc|At}:4 -> accesslog * OLcfgOv{Oc|At}:4 -> accesslog
* OLcfgOv{Oc|At}:5 -> valsort * OLcfgOv{Oc|At}:5 -> valsort
* (FIXME: separate arc for contribware?)
* OLcfgOv{Oc|At}:6 -> smbk5pwd
* OLcfgOv{Oc|At}:7 -> distproc * OLcfgOv{Oc|At}:7 -> distproc
* OLcfgOv{Oc|At}:8 -> dynlist * OLcfgOv{Oc|At}:8 -> dynlist
* OLcfgOv{Oc|At}:9 -> dds * OLcfgOv{Oc|At}:9 -> dds
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment