From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 29 Sep 2000 18:27:06 +0000 (+0000)
Subject: ITS#791: fix SASL ctx close
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1855
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd733e163a74db2968107b75e14f8705417b02c5;p=openldap

ITS#791: fix SASL ctx close
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 5930e84b23..6560eeebb3 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -327,8 +327,10 @@ int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
 
 	if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO,
 			&ldap_pvt_sockbuf_io_sasl ) )
+	{
 		ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl,
 			LBER_SBIOD_LEVEL_APPLICATION, ctx_arg );
+	}
 
 	return LDAP_SUCCESS;
 }
@@ -437,9 +439,8 @@ ldap_int_sasl_open(
 int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
 {
 	sasl_conn_t *ctx = lc->lconn_sasl_ctx;
-	assert( ctx != NULL );
 
-	if( ctx ) {
+	if( ctx != NULL ) {
 		sasl_dispose( &ctx );
 		lc->lconn_sasl_ctx = NULL;
 	}