SMTP: don't interactively authenticate without a password in batch/mailx mode

Otherwise, if we don't have a password and curses is not running, the
SASL authentication callback will crash mutt. We now abort if the
password wasn't given in $smtp_url.

diff --git a/ChangeLog b/ChangeLog
index 102759d070e12a54d61b32257aceea2756803b53..ab235968ec406e18a3f8b4f69c64ebd2df93730d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-28 15:20 +0200  Rocco Rutte  <pdmef@gmx.net>  (84a56dcb0572)
+
+       * doc/mutt.css: Manual: vertical-align table cells at the top
+
+2009-05-28 15:19 +0200  Rocco Rutte  <pdmef@gmx.net>  (ee2ebf6cf363)
+
+       * ChangeLog, doc/manual.xml.head, doc/mutt.css: Manual: Wrap muttrc
+       commands in <command/>
+
 2009-05-27 23:14 -0700  Brendan Cully  <brendan@kublai.com>  (5502fb790bab)
 
        * mutt_ssl_gnutls.c: gnutls: do not ignore certificate problems.

diff --git a/smtp.c b/smtp.c
index e6c82f906f589bd096b028ac85283b512f441fb7..0d2620b69ed0b484e29593bcedd02c3bc32df594 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -422,6 +422,12 @@ static int smtp_open (CONNECTION* conn)
     }
 
 #ifdef USE_SASL
+    if (!(conn->account.flags & M_ACCT_PASS) || !option (OPTNOCURSES))
+    {
+      mutt_error (_("Interactive SMTP authentication not supported"));
+      mutt_sleep (1);
+      return -1;
+    }
     return smtp_auth (conn);
 #else
     mutt_error (_("SMTP authentication requires SASL"));