- if (sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,
+ /* Don't call sm_auth_sasl() for XAUTH2 with -sasl. Instead, call
+ sm_auth_xoauth2() below. */
+ if (xoauth_client_res == NULL &&
+ sm_auth_sasl(user, saslssf, saslmech ? saslmech : server_mechs,