From d0f00d91d79cd25233433c854116164acc7c0d32 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 14 2018 13:04:35 +0000
Subject: import openldap-2.4.44-15.el7_5


---

diff --git a/SOURCES/openldap-tlsmc.patch b/SOURCES/openldap-tlsmc.patch
index b498a41..405e54f 100644
--- a/SOURCES/openldap-tlsmc.patch
+++ b/SOURCES/openldap-tlsmc.patch
@@ -1,7 +1,7 @@
 MozNSS Interception Code
 
 Author: Matus Honek <mhonek@redhat.com>
-Date: Wed Jan 31 22:08:28 CET 2018
+Date: Wed Feb 21 20:04:11 CET 2018
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
@@ -283,7 +283,7 @@ diff --git a/libraries/libldap/tls_mc.c b/libraries/libldap/tls_mc.c
 new file mode 100644
 --- /dev/null
 +++ b/libraries/libldap/tls_mc.c
-@@ -0,0 +1,1345 @@
+@@ -0,0 +1,1346 @@
 +#include "portable.h"
 +
 +#ifdef HAVE_MOZNSS_COMPATIBILITY
@@ -1375,6 +1375,7 @@ new file mode 100644
 +		Debug( LDAP_DEBUG_ANY,
 +		       "tlsmc_extract_nssdb: ERROR: could not export CA certificates.\n",
 +		       0, 0, 0 );
++		goto bail;
 +	}
 +
 +	if ( 0 == tlsmc_extract_cert_key_pair( *ld_cert, *ld_key, dir_name ) ) {
diff --git a/SPECS/openldap.spec b/SPECS/openldap.spec
index 2db42cc..85abac9 100644
--- a/SPECS/openldap.spec
+++ b/SPECS/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.44
-Release: 13%{?dist}
+Release: 15%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -660,6 +660,12 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr  3 2018 Matus Honek <mhonek@redhat.com> - 2.4.44-15
+- Bump release to version 2.4.44-15
+
+* Thu Mar 29 2018 Matus Honek <mhonek@redhat.com> - 2.4.44-14
+- MozNSS Compat. Layer: Enforce fail when cannot extract CA certs (#1563080)
+
 * Wed Jan 31 2018 Matus Honek <mhonek@redhat.com> - 2.4.44-13
 - MozNSS Compat. Layer: fix recursive directory deletion (#1516409)
 - MozNSS Compat. Layer: fix PIN disclaimer not always shown (#1516409)