ITS#5368

diff --git a/CHANGES b/CHANGES
index 86aa8f493aade020256c384b6809622610930167..74e2f20d268e798cb94222d5c9162bb924fe54e8 100644 (file)
--- 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 f794a99f8790b04eaeab111621e110cb308ec7b6..3d728339a3ef1f712402402a06c6ad73c79762a9 100644 (file)
--- 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 ) {