Import ITS#3278 from HEAD

diff --git a/CHANGES b/CHANGES
index de3957d34e0fa4e42e57234915df9908de10bf9d..92fc963e440414d1e69ea2bfed2ec2848ed0d2c4 100644 (file)
--- 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 a324a681f0df83359d2ed6df0a4f5e008fd00c01..c36fddd6c3237f31c479a643028fb94ad92feafd 100644 (file)
--- 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;
                }
        }