From 4e23cfc4a9deeb2210dc324f1ab11cc94ddfe39e Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 18 Dec 2018 21:05:09 +0000
Subject: [PATCH] ITS#8286 - Additional fixes Fix incorrect matching rules for
 olcTLSCertificateKey and olcDbCryptKey Fix SYNTAX for olcRootPW to be
 octetString

---
 servers/slapd/back-bdb/config.c | 2 +-
 servers/slapd/bconfig.c         | 4 ++--
 servers/slapd/overlays/pcache.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 99716abf2b..15382ded07 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -91,7 +91,7 @@ static ConfigTable bdbcfg[] = {
 	{ "cryptkey", "key", 2, 2, 0, ARG_BERVAL|ARG_MAGIC|BDB_CRYPTKEY,
 		bdb_cf_gen, "( OLcfgDbAt:1.14 NAME 'olcDbCryptKey' "
 			"DESC 'DB encryption key' "
-			"EQUALITY caseExactMatch "
+			"EQUALITY octetStringMatch "
 			"SYNTAX OMsOctetString SINGLE-VALUE )",NULL, NULL },
 	{ "dbconfig", "DB_CONFIG setting", 1, 0, 0, ARG_MAGIC|BDB_CONFIG,
 		bdb_cf_gen, "( OLcfgDbAt:1.3 NAME 'olcDbConfig' "
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index e30edd664c..6b5f7da1fd 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -602,7 +602,7 @@ static ConfigTable config_back_cf_table[] = {
 	{ "rootpw", "password", 2, 2, 0, ARG_BERVAL|ARG_DB|ARG_MAGIC,
 		&config_rootpw, "( OLcfgDbAt:0.9 NAME 'olcRootPW' "
 			"EQUALITY octetStringMatch "
-			"SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
+			"SYNTAX OMsOctetString SINGLE-VALUE )", NULL, NULL },
 	{ "sasl-authz-policy", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZPOLICY,
 		&config_generic, NULL, NULL, NULL },
 	{ "sasl-auxprops", NULL, 2, 0, 0,
@@ -796,7 +796,7 @@ static ConfigTable config_back_cf_table[] = {
 #endif
 		"( OLcfgGlAt:99 NAME 'olcTLSCertificateKey' "
 			"DESC 'X.509 privateKey, must use ;binary' "
-			"EQUALITY octetStringMatch "
+			"EQUALITY privateKeyMatch "
 			"SYNTAX 1.3.6.1.4.1.4203.666.2.13 SINGLE-VALUE )", NULL, NULL },
 	{ "TLSCertificateKeyFile", NULL, 2, 2, 0,
 #ifdef HAVE_TLS
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index f60dd3391e..76b69d28c8 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -3684,7 +3684,7 @@ static ConfigTable pccfg[] = {
 		2, 2, 0, ARG_INT|ARG_MAGIC|PC_QUERIES, pc_cf_gen,
 		"( OLcfgOvAt:2.5 NAME ( 'olcPcacheMaxQueries' 'olcProxyCacheQueries' ) "
 			"DESC 'Maximum number of queries to cache' "
-			"EQUALITY caseIgnoreMatch "
+			"EQUALITY integerMatch "
 			"SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
 	{ "pcachePersist", "TRUE|FALSE",
 		2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, save_queries),