Commit 696d5656 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#9241 all ARG_DN configs must also use ARG_QUOTE

parent cbb6441c
......@@ -377,10 +377,10 @@ static ConfigTable metacfg[] = {
ARG_MAGIC|ARG_ON_OFF|LDAP_BACK_CFG_PSEUDOROOT_BIND_DEFER,
meta_back_cf_gen, NULL, NULL, NULL },
{ "pseudorootdn", "dn", 2, 2, 0,
ARG_MAGIC|ARG_DN|LDAP_BACK_CFG_PSEUDOROOTDN,
ARG_MAGIC|ARG_DN|ARG_QUOTE|LDAP_BACK_CFG_PSEUDOROOTDN,
meta_back_cf_gen, NULL, NULL, NULL },
{ "pseudorootpw", "password", 2, 2, 0,
ARG_MAGIC|ARG_STRING|LDAP_BACK_CFG_PSEUDOROOTDN,
ARG_MAGIC|ARG_STRING|LDAP_BACK_CFG_PSEUDOROOTPW,
meta_back_cf_gen, NULL, NULL, NULL },
{ "nretries", "NEVER|forever|<number>", 2, 2, 0,
ARG_MAGIC|LDAP_BACK_CFG_NRETRIES,
......
......@@ -95,7 +95,7 @@ enum {
};
static ConfigTable log_cfats[] = {
{ "logdb", "suffix", 2, 2, 0, ARG_DN|ARG_MAGIC|LOG_DB,
{ "logdb", "suffix", 2, 2, 0, ARG_DN|ARG_QUOTE|ARG_MAGIC|LOG_DB,
log_cf_gen, "( OLcfgOvAt:4.1 NAME 'olcAccessLogDB' "
"DESC 'Suffix of database for log content' "
"EQUALITY distinguishedNameMatch "
......
......@@ -771,7 +771,7 @@ static ConfigTable autoca_cfg[] = {
"EQUALITY integerMatch "
"SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
{ "localdn", "dn", 2, 2, 0,
ARG_DN|ARG_MAGIC|ACA_LOCALDN, autoca_cf,
ARG_DN|ARG_QUOTE|ARG_MAGIC|ACA_LOCALDN, autoca_cf,
"( OLcfgOvAt:22.9 NAME 'olcAutoCAlocalDN' "
"DESC 'DN of local server cert' "
"EQUALITY distinguishedNameMatch "
......
......@@ -1688,7 +1688,7 @@ static ConfigDriver mo_cf_gen;
static ConfigTable mo_cfg[] = {
{ "memberof-dn", "modifiersName",
2, 2, 0, ARG_MAGIC|ARG_DN|MO_DN, mo_cf_gen,
2, 2, 0, ARG_MAGIC|ARG_QUOTE|ARG_DN|MO_DN, mo_cf_gen,
"( OLcfgOvAt:18.0 NAME 'olcMemberOfDN' "
"DESC 'DN to be used as modifiersName' "
"EQUALITY distinguishedNameMatch "
......
......@@ -116,13 +116,13 @@ static ConfigTable refintcfg[] = {
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
{ "refint_nothing", "string", 2, 2, 0,
ARG_DN|ARG_MAGIC|REFINT_NOTHING, refint_cf_gen,
ARG_DN|ARG_QUOTE|ARG_MAGIC|REFINT_NOTHING, refint_cf_gen,
"( OLcfgOvAt:11.2 NAME 'olcRefintNothing' "
"DESC 'Replacement DN to supply when needed' "
"EQUALITY distinguishedNameMatch "
"SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },
{ "refint_modifiersName", "DN", 2, 2, 0,
ARG_DN|ARG_MAGIC|REFINT_MODIFIERSNAME, refint_cf_gen,
ARG_DN|ARG_QUOTE|ARG_MAGIC|REFINT_MODIFIERSNAME, refint_cf_gen,
"( OLcfgOvAt:11.3 NAME 'olcRefintModifiersName' "
"DESC 'The DN to use as modifiersName' "
"EQUALITY distinguishedNameMatch "
......
......@@ -790,7 +790,7 @@ static ConfigDriver rc_cf_gen;
static ConfigTable rccfg[] = {
{ "retcode-parent", "dn",
2, 2, 0, ARG_MAGIC|ARG_DN|RC_PARENT, rc_cf_gen,
2, 2, 0, ARG_MAGIC|ARG_DN|ARG_QUOTE|RC_PARENT, rc_cf_gen,
"( OLcfgOvAt:20.1 NAME 'olcRetcodeParent' "
"DESC '' "
"EQUALITY distinguishedNameMatch "
......
......@@ -3524,7 +3524,7 @@ static ConfigTable spcfg[] = {
"DESC 'Observe Reload Hint in Request control' "
"EQUALITY booleanMatch "
"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
{ "syncprov-sessionlog-source", NULL, 2, 2, 0, ARG_DN|ARG_MAGIC|SP_LOGDB,
{ "syncprov-sessionlog-source", NULL, 2, 2, 0, ARG_DN|ARG_QUOTE|ARG_MAGIC|SP_LOGDB,
sp_cf_gen, "( OLcfgOvAt:1.5 NAME 'olcSpSessionlogSource' "
"DESC 'On startup, try loading sessionlog from this subtree' "
"SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },
......
......@@ -87,7 +87,7 @@ static ConfigDriver unique_cf_strict;
static ConfigDriver unique_cf_uri;
static ConfigTable uniquecfg[] = {
{ "unique_base", "basedn", 2, 2, 0, ARG_DN|ARG_MAGIC|UNIQUE_BASE,
{ "unique_base", "basedn", 2, 2, 0, ARG_DN|ARG_QUOTE|ARG_MAGIC|UNIQUE_BASE,
unique_cf_base, "( OLcfgOvAt:10.1 NAME 'olcUniqueBase' "
"DESC 'Subtree for uniqueness searches' "
"EQUALITY distinguishedNameMatch "
......
Markdown is supported
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