From 0992cf19a9381c63bf5146d10e356046b28bb5f1 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 26 Mar 2012 13:41:40 +0200 Subject: [PATCH 1/2] fix: Re-binding to a failed connection can segfault Resolves: #784989 --- openldap-ld_defconn-rebind.patch | 19 +++++++++++++++++++ openldap.spec | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 openldap-ld_defconn-rebind.patch diff --git a/openldap-ld_defconn-rebind.patch b/openldap-ld_defconn-rebind.patch new file mode 100644 index 0000000..102fd10 --- /dev/null +++ b/openldap-ld_defconn-rebind.patch @@ -0,0 +1,19 @@ +commit dcf94e25f57c2f24936c3ce66d2350c391354da1 +Author: Howard Chu +Date: Mon Mar 26 03:32:11 2012 -0700 + + ITS#7207 check for ld->ld_defconn + +diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c +index 0248101..2475a87 100644 +--- a/libraries/libldap/cyrus.c ++++ b/libraries/libldap/cyrus.c +@@ -419,7 +419,7 @@ ldap_int_sasl_bind( + LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); + ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, &sd ); + +- if ( sd == AC_SOCKET_INVALID ) { ++ if ( sd == AC_SOCKET_INVALID || !ld->ld_defconn ) { + /* not connected yet */ + + rc = ldap_open_defconn( ld ); diff --git a/openldap.spec b/openldap.spec index eb0e6fd..132bbfd 100644 --- a/openldap.spec +++ b/openldap.spec @@ -8,7 +8,7 @@ Name: openldap Version: 2.4.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP @@ -39,6 +39,7 @@ Patch7: openldap-dns-priority.patch Patch8: openldap-syncrepl-unset-tls-options.patch Patch9: openldap-constraint-count.patch Patch10: openldap-man-sasl-nocanon.patch +Patch11: openldap-ld_defconn-rebind.patch # Fedora specific patches Patch100: openldap-fedora-systemd.patch @@ -144,6 +145,7 @@ pushd openldap-%{version} %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch100 -p1 @@ -655,6 +657,9 @@ exit 0 %{evolution_connector_prefix}/ %changelog +* Mon Mar 26 2012 Jan Synáček 2.4.30-2 +- fix: Re-binding to a failed connection can segfault (#784989) + * Thu Mar 01 2012 Jan Vcelak 2.4.30-1 - new upstream release + server: fixes in mdb backend From 440b96e85c2d7952c4bbfe441c2be8d8572c710c Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 5 Apr 2012 20:41:25 +0200 Subject: [PATCH 2/2] rebuild due to libdb rebase --- openldap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openldap.spec b/openldap.spec index 132bbfd..979a4c0 100644 --- a/openldap.spec +++ b/openldap.spec @@ -8,7 +8,7 @@ Name: openldap Version: 2.4.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP @@ -657,6 +657,9 @@ exit 0 %{evolution_connector_prefix}/ %changelog +* Thu Apr 05 2012 Jan Vcelak 2.4.30-3 +- rebuild due to libdb rebase + * Mon Mar 26 2012 Jan Synáček 2.4.30-2 - fix: Re-binding to a failed connection can segfault (#784989)