From: Howard Chu <hyc@openldap.org>
Date: Thu, 9 Jun 2005 07:45:48 +0000 (+0000)
Subject: Import ITS#3278 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_27~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75227eef9ea1ac309c4095b9433283dabda92f6c;p=thirdparty%2Fopenldap.git

Import ITS#3278 from HEAD
---

diff --git a/CHANGES b/CHANGES
index de3957d34e..92fc963e44 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.2.27 Engineering
 	Fixed ACL dn=* <what> clause
 	Fixed ACL val default style parsing crasher (ITS#3700)
 	Disabled slapd broken undocumented configuration directive
+	Fixed libldap sasl connection assert (ITS#3278)
 	Build Environment
 		Improved thread set stack size support (ITS#3691)
 
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index a324a681f0..c36fddd6c3 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -833,7 +833,7 @@ ldap_int_sasl_bind(
 				sasl_dispose( &oldctx );
 				ldap_pvt_sasl_remove( ld->ld_defconn->lconn_sb );
 			}
-			ldap_pvt_sasl_install( ld->ld_conns->lconn_sb, ctx );
+			ldap_pvt_sasl_install( ld->ld_defconn->lconn_sb, ctx );
 			ld->ld_defconn->lconn_sasl_sockctx = ctx;
 		}
 	}