Fixed -lldap SASL ctx close bug (ITS#790)

This commit is contained in:
Kurt Zeilenga 2000-09-29 19:02:11 +00:00
parent 279450e04f
commit c155c66fe4
2 changed files with 4 additions and 2 deletions

View File

@ -6,6 +6,7 @@ OpenLDAP 2.0.X Engineering
Fixed slapd idletimeout lock bug (ITS#767) Fixed slapd idletimeout lock bug (ITS#767)
Fixed slapd caseIgnoreIA5string indexing bug (ITS#786) Fixed slapd caseIgnoreIA5string indexing bug (ITS#786)
Fixed slurpd TLS initialization bug (ITS#768) Fixed slurpd TLS initialization bug (ITS#768)
Fixed -lldap SASL ctx close bug (ITS#790)
Updated -llber bprint routine Updated -llber bprint routine
Build Environment Build Environment
Fixed VPATH schema install Fixed VPATH schema install

View File

@ -326,8 +326,10 @@ int ldap_pvt_sasl_install( Sockbuf *sb, void *ctx_arg )
if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, if ( !ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO,
&ldap_pvt_sockbuf_io_sasl ) ) &ldap_pvt_sockbuf_io_sasl ) )
{
ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl, ber_sockbuf_add_io( sb, &ldap_pvt_sockbuf_io_sasl,
LBER_SBIOD_LEVEL_APPLICATION, ctx_arg ); LBER_SBIOD_LEVEL_APPLICATION, ctx_arg );
}
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
@ -436,9 +438,8 @@ ldap_int_sasl_open(
int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc ) int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
{ {
sasl_conn_t *ctx = lc->lconn_sasl_ctx; sasl_conn_t *ctx = lc->lconn_sasl_ctx;
assert( ctx != NULL );
if( ctx ) { if( ctx != NULL ) {
sasl_dispose( &ctx ); sasl_dispose( &ctx );
lc->lconn_sasl_ctx = NULL; lc->lconn_sasl_ctx = NULL;
} }