Cyrus SASL uses screwy terms.

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 00079c52b80b992d1469c2d3e3d643dde2e85532..ecfe39297749652575c774e046aa7e61df71f941 100644 (file)
--- 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;
        }