From: Howard Chu <hyc@openldap.org>
Date: Tue, 18 Dec 2018 21:59:59 +0000 (+0000)
Subject: More for privateKey tweak
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f8a60be8c26a1148b07c2bdeaa71aefee6fc80;p=thirdparty%2Fopenldap.git

More for privateKey tweak

Leave olcTLSCertificateKey as its own attr, not a subtype
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 0e51528fb0..88aa26b36a 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -796,7 +796,8 @@ static ConfigTable config_back_cf_table[] = {
 #endif
 		"( OLcfgGlAt:99 NAME 'olcTLSCertificateKey' "
 			"DESC 'X.509 privateKey, must use ;binary' "
-			"SUP pKCS8PrivateKey SINGLE-VALUE )", NULL, NULL },
+			"EQUALITY privateKeyMatch "
+			"SYNTAX 1.2.840.113549.1.8.1.1 SINGLE-VALUE )", NULL, NULL },
 	{ "TLSCertificateKeyFile", NULL, 2, 2, 0,
 #ifdef HAVE_TLS
 		CFG_TLS_CERT_KEY|ARG_STRING|ARG_MAGIC, &config_tls_option,