X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fsmtp.c;h=fdf52218eb091683471551b589f600bdb1c708a9;hp=cbcc8f780ae617e35e48fcfd9cbf9284c9c2d722;hb=0f10e3ceeed435e8ba929633c56153abc0dec7ef;hpb=48800d40174bd5c5e4596c71774b17cf3577c89c;ds=sidebyside

diff --git a/src/smtp.c b/src/smtp.c
index cbcc8f780..fdf52218e 100644
--- 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 (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 */
-			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;