[openldap/f15] fix: Re-binding to a failed connection can segfault

[jsynacek]

commit 28edf971089b9198689f4c1266f0d815e71fafac
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Mon Mar 26 13:41:40 2012 +0200

    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 deletions(-)
---
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 <hyc at openldap.org>
+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 1b6defc..4a7af0c 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,7 +7,7 @@
 
 Name: openldap
 Version: 2.4.24
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -50,6 +50,7 @@ Patch27: openldap-nss-can-ignore-expired-issuer.patch
 Patch28: openldap-sql-datatypes.patch
 Patch29: openldap-nss-handshake-threadsafe.patch
 Patch30: openldap-syncrepl-unset-tls-options.patch
+Patch31: openldap-ld_defconn-rebind.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -172,6 +173,7 @@ pushd openldap-%{version}
 %patch28 -p1 -b .sql-datatypes
 %patch29 -p1 -b .nss-handshake-threadsafe
 %patch30 -p1 -b .syncrepl-unset-tls-options
+%patch31 -p1 -b .ld_defconn-rebind
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -713,6 +715,9 @@ exit 0
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Mar 26 2012 Jan Synáček <jsynacek at redhat.com> 2.4.26-7
+- fix: Re-binding to a failed connection can segfault (#784989)
+
 * Mon Sep 12 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.24-5
 - fix: SSL_ForceHandshake function is not thread safe (#701678)
 - fix: allow unsetting of tls_* syncrepl options (#734187)