From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 12 Feb 2008 01:54:34 +0000 (+0000)
Subject: ITS#5368
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9aa70639a1e548c87878416179bddc70aff2518d;p=openldap

ITS#5368
---

diff --git a/CHANGES b/CHANGES
index 86aa8f493a..74e2f20d26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ OpenLDAP 2.4.8 Engineering
 	Fixed slapd cn=config crash on delete (ITS#5343)
 	Fixed slapd cn=config global acls (ITS#5352)
 	Fixed slapd truncated cookie (ITS#5362)
+	Fixed slapd sasl with CLEARTEXT (ITS#5368)
 	Fixed slapd str2entry with no attrs (ITS#5308)
 	Fixed slapd TLSVerifyClient default (ITS#5360)
 	Fixed slapd-bdb crash with modrdn (ITS#5358)
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index f794a99f87..3d728339a3 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -216,7 +216,8 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
 					 * past the scheme name, skip this value.
 					 */
 #ifdef SLAPD_CLEARTEXT
-					if ( !ber_bvstrcasecmp( bv, &sc_cleartext ) ) {
+					if ( !strncasecmp( bv->bv_val, sc_cleartext.bv_val,
+						sc_cleartext.bv_len )) {
 						struct berval cbv;
 						cbv.bv_len = bv->bv_len - sc_cleartext.bv_len;
 						if ( cbv.bv_len > 0 ) {