[Pkg-openldap-devel] [openldap] 01/04: r2348 at pulsar: torsten | 2005-07-03 10:53:37 +0200 * [SECURITY] Possible password disclosure (CAN-2005-2069) + libraries/libldap/tls.c: Make sure that TLS is enabled when handling referrals with "ssl start_tls" in /etc/ldap/ldap.conf (closes: #316674). -- Torsten Landschoff <torsten at debian.org> Sun, 3 Jul 2005 10:52:07 +0200

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.1.30-11
in repository openldap.

commit 571db6aec2275ccd88a5f475b7a254fd0222778e
Author: Torsten Landschoff <torsten at debian.org>
Date:   Sun Jul 3 09:27:28 2005 +0000

     r2348 at pulsar:  torsten | 2005-07-03 10:53:37 +0200
      * [SECURITY] Possible password disclosure                 (CAN-2005-2069)
      + libraries/libldap/tls.c: Make sure that TLS is enabled when handling
        referrals with "ssl start_tls" in /etc/ldap/ldap.conf (closes: #316674).
     -- Torsten Landschoff <torsten at debian.org>  Sun,  3 Jul 2005 10:52:07 +0200
---
 debian/changelog        |    8 ++++++++
 libraries/libldap/tls.c |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cebea24..caf3dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openldap2 (2.1.30-11) unstable; urgency=high
+
+  * [SECURITY] Possible password disclosure                 (CAN-2005-2069)
+  + libraries/libldap/tls.c: Make sure that TLS is enabled when handling
+    referrals with "ssl start_tls" in /etc/ldap/ldap.conf (closes: #316674).
+
+ -- Torsten Landschoff <torsten at debian.org>  Sun,  3 Jul 2005 10:52:07 +0200
+
 openldap2 (2.1.30-10) unstable; urgency=low
 
   * Apply patch by Steven Ihde to fix libldap NTLM integration (and correct
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index a73d7f6..ddbb697 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -1956,7 +1956,8 @@ ldap_start_tls_s ( LDAP *ld,
 
 	/* XXYYZ: this initiates operation only on default connection! */
 
-	if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {
+	if ( ( ld->ld_defconn != NULL ) ? ( ld->ld_defconn->lconn_sb != NULL && ldap_pvt_tls_inplace( ld->ld_defconn->lconn_sb ) != 0 )
+			: ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) ) {
 		return LDAP_LOCAL_ERROR;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git