try to authenticate with CRAM-MD5

[claws.git] / src / smtp.c

diff --git a/src/smtp.c b/src/smtp.c
index cbcc8f780ae617e35e48fcfd9cbf9284c9c2d722..fdf52218eb091683471551b589f600bdb1c708a9 100644 (file)
--- a/src/smtp.c
+++ b/src/smtp.c
@@ -53,9 +53,11 @@ gint smtp_from(SockInfo *sock, const gchar *from,
 
        if (use_smtp_auth) {
                /* exist AUTH-Type CRAM_MD5 */
 
        if (use_smtp_auth) {
                /* exist AUTH-Type CRAM_MD5 */

-               if (esmtp_auth_cram_md5(sock) == SM_ERROR) {
+               if (!smtp_auth_methods[SMTPAUTH_CRAM_MD5]
+                   || esmtp_auth_cram_md5(sock) == SM_ERROR) {

                        /* exist AUTH-Type LOGIN */
                        /* exist AUTH-Type LOGIN */

-                       if (esmtp_auth_login(sock) == SM_ERROR)
+                       if (!smtp_auth_methods[SMTPAUTH_LOGIN]
+                           || esmtp_auth_login(sock) == SM_ERROR)

                                return SM_ERROR;
                        else
                                authtype = SMTPAUTH_LOGIN;
                                return SM_ERROR;
                        else
                                authtype = SMTPAUTH_LOGIN;