+2011-01-18 [colin] 3.7.8cvs37
+
+ * src/common/smtp.c
+ Fix logic on SMTP AUTH: If the selected method isn't
+ available, say so instead of supposing it'll work.
+ Fixes bug #2039, 'SMTP AUTHENTICATION'
+
2011-01-15 [pawel] 3.7.8cvs36
* src/prefs_folder_item.c
( cvs diff -u -r 1.96.2.227 -r 1.96.2.228 src/textview.c; ) > 3.7.8cvs34.patchset
( cvs diff -u -r 1.96.2.228 -r 1.96.2.229 src/textview.c; ) > 3.7.8cvs35.patchset
( cvs diff -u -r 1.52.2.80 -r 1.52.2.81 src/prefs_folder_item.c; ) > 3.7.8cvs36.patchset
+( cvs diff -u -r 1.11.2.28 -r 1.11.2.29 src/common/smtp.c; ) > 3.7.8cvs37.patchset
session->state = SMTP_AUTH;
- if (session->forced_auth_type == SMTPAUTH_CRAM_MD5 ||
- (session->forced_auth_type == 0 &&
- (session->avail_auth_type & SMTPAUTH_CRAM_MD5) != 0))
+ if ((session->forced_auth_type == SMTPAUTH_CRAM_MD5
+ || session->forced_auth_type == 0)
+ &&
+ (session->avail_auth_type & SMTPAUTH_CRAM_MD5) != 0)
smtp_auth_cram_md5(session);
- else if (session->forced_auth_type == SMTPAUTH_LOGIN ||
- (session->forced_auth_type == 0 &&
- (session->avail_auth_type & SMTPAUTH_LOGIN) != 0))
+ else if ((session->forced_auth_type == SMTPAUTH_LOGIN
+ || session->forced_auth_type == 0)
+ &&
+ (session->avail_auth_type & SMTPAUTH_LOGIN) != 0)
smtp_auth_login(session);
- else if (session->forced_auth_type == SMTPAUTH_PLAIN ||
- (session->forced_auth_type == 0 &&
- (session->avail_auth_type & SMTPAUTH_PLAIN) != 0))
+ else if ((session->forced_auth_type == SMTPAUTH_PLAIN
+ || session->forced_auth_type == 0)
+ &&
+ (session->avail_auth_type & SMTPAUTH_PLAIN) != 0)
smtp_auth_plain(session);
- else {
- log_warning(LOG_PROTOCOL, _("SMTP AUTH not available\n"));
+ else if (session->forced_auth_type == 0) {
+ log_warning(LOG_PROTOCOL, _("No SMTP AUTH method available\n"));
+ return SM_AUTHFAIL;
+ } else {
+ log_warning(LOG_PROTOCOL, _("Selected SMTP AUTH method not available\n"));
return SM_AUTHFAIL;
}