ITS#9241 all ARG_DN configs must also use ARG_QUOTE

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 626c93674862f7997798f4e5244da9d247788ec8..849917016a1a136721ffb8f88559ab61f61001e2 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -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,

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index d33ff82326062b55f27c1cbed1dd128f1962e092..14cd208fb6ed73649046c9f1c6afda68832271f4 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -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 "

diff --git a/servers/slapd/overlays/autoca.c b/servers/slapd/overlays/autoca.c
index 1ab6ab07c12cadad1ae851573fd90fce823d77d7..cb0227001e3abc4fcb4ca703b19aee9f9fc50260 100644 (file)
--- a/servers/slapd/overlays/autoca.c
+++ b/servers/slapd/overlays/autoca.c
@@ -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 "

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 95c1d8d9bbc8e28e7c039dc079ce6139e452d13e..d76f8f40e4744efdfdfc7ce18d1c4af39171f973 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -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 "

diff --git a/servers/slapd/overlays/refint.c b/servers/slapd/overlays/refint.c
index 838147432cb2f1799e297cd3ad6fce35db70583b..602a7444581700f819d536aa71a096c75f503ae5 100644 (file)
--- a/servers/slapd/overlays/refint.c
+++ b/servers/slapd/overlays/refint.c
@@ -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 "

diff --git a/servers/slapd/overlays/retcode.c b/servers/slapd/overlays/retcode.c
index 488aefd43e577f1595d93d4c7fd780c95ba91d46..ec548367f7b597d6ce0ae41f1a9c2c4a689d7355 100644 (file)
--- a/servers/slapd/overlays/retcode.c
+++ b/servers/slapd/overlays/retcode.c
@@ -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 "

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 328bafaa8274bd4a502c29c6872c33d074567204..111935e8f7129aff6b544b02fa6c78c716c9f75b 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -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 },

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index e8efb9fc8f6b06ab63727d06b77f07a3931b2b70..27a27d7d4455757258d4ba1eaed3f667d7853f31 100644 (file)
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -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 "