From c43fec53f53ac0e9def73c940441fb2195279b1d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 14 Mar 2000 03:08:46 +0000 Subject: [PATCH] Cyrus SASL uses screwy terms. --- libraries/libldap/sasl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c index 00079c52b8..ecfe392977 100644 --- a/libraries/libldap/sasl.c +++ b/libraries/libldap/sasl.c @@ -829,12 +829,18 @@ ldap_negotiated_sasl_bind_s( sasl_callback_t callbacks[4]; int rc; - callbacks[n=0].id = SASL_CB_USER; + /* + * Cyrus uses screwy terms. The authname is the + * SASL "username" or authentication identity. + * The user is the authorization identity. + */ + + callbacks[n=0].id = SASL_CB_AUTHNAME; callbacks[n].proc = ldap_pvt_sasl_getsimple; callbacks[n].context = (void *)authenticationId; if( authorizationId != NULL ) { - callbacks[++n].id = SASL_CB_AUTHNAME; + callbacks[++n].id = SASL_CB_USER; callbacks[n].proc = ldap_pvt_sasl_getsimple; callbacks[n].context = (void *)authorizationId; } -- 2.39.5