mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate SASL client session_callbacks. Since proc was always NULL they

Browse Source 
never did anything anyway.
This commit is contained in:
Howard Chu 2002-06-06 01:44:38 +00:00
parent 91088eaa84
commit 353f627aa4
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/libldap/cyrus.c
View File

@ -434,19 +434,6 @@ ldap_int_sasl_open(
int rc;
sasl_conn_t *ctx;
sasl_callback_t *session_callbacks =
LDAP_CALLOC( 2, sizeof( sasl_callback_t ) );
if( session_callbacks == NULL ) return LDAP_NO_MEMORY;
session_callbacks[0].id = SASL_CB_USER;
session_callbacks[0].proc = NULL;
session_callbacks[0].context = ld;
session_callbacks[1].id = SASL_CB_LIST_END;
session_callbacks[1].proc = NULL;
session_callbacks[1].context = NULL;
assert( lc->lconn_sasl_ctx == NULL );
if ( host == NULL ) {
@ -456,14 +443,13 @@ ldap_int_sasl_open(
#if SASL_VERSION_MAJOR >= 2
rc = sasl_client_new( "ldap", host, NULL, NULL,
session_callbacks, 0, &ctx );
NULL, 0, &ctx );
#else
rc = sasl_client_new( "ldap", host, session_callbacks,
rc = sasl_client_new( "ldap", host, NULL,
SASL_SECURITY_LAYER, &ctx );
#endif
if ( rc != SASL_OK ) {
LDAP_FREE( session_callbacks );
ld->ld_errno = sasl_err2ldap( rc );
return ld->ld_errno;
}
@ -477,7 +463,6 @@ ldap_int_sasl_open(
#endif
lc->lconn_sasl_ctx = ctx;
lc->lconn_sasl_cbs = session_callbacks;
if( ssf ) {
#if SASL_VERSION_MAJOR >= 2
@ -510,8 +495,6 @@ int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
if( ctx != NULL ) {
sasl_dispose( &ctx );
lc->lconn_sasl_ctx = NULL;
LDAP_FREE( lc->lconn_sasl_cbs );
lc->lconn_sasl_cbs = NULL;
}
return LDAP_SUCCESS;

1
libraries/libldap/ldap-int.h
View File

@ -189,7 +189,6 @@ typedef struct ldap_conn {
#endif
#ifdef HAVE_CYRUS_SASL
void *lconn_sasl_ctx;
void *lconn_sasl_cbs;
#endif
int lconn_refcnt;
time_t lconn_lastused; /* time */