From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 11 Oct 2017 19:47:24 +0000 (-0700)
Subject: ITS#7389
X-Git-Tag: OPENLDAP_REL_ENG_2_4_46~52
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=ff09609f3e133bb0fda3bee1c5d691db149110f7

ITS#7389
---

diff --git a/CHANGES b/CHANGES
index e000296201..1fea52914d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.46 Engineering
 	Fixed libldap to not reuse tls_session if TLS hostname check fails (ITS#7373)
 	Fixed libldap cross-compiling with OpenSSL 1.1 (ITS#8687)
 	Fixed libldap MozNSS CA certificate hash matching (ITS#7374)
+	Fixed libldap MozNSS with PEM certs when also using an NSS cert db (ITS#7389)
 	Fixed slapd Eventlog registry key creation on 64-bit Windows (ITS#8705)
 	Fixed slapd-ldap TLS connection timeout with high latency connections (ITS#8720)
 	Fixed slapd-ldap to ignore unknown schema when omit-unknown-schema is set (ITS#7520)