Make getuser/pass abort if input is required in batch mode.

Replaces [0a3de4d9a009]. See #3289.

1 files changed, 4 insertions, 0 deletions

diff --git a/account.c b/account.c
index b305f788..f7389914 100644
--- a/account.c
+++ b/account.c
@@ -155,6 +155,8 @@ int mutt_account_getuser (ACCOUNT* account)
   else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
     strfcpy (account->user, PopUser, sizeof (account->user));
 #endif
+  else if (option (OPTNOCURSES))
+    return -1;
   /* prompt (defaults to unix username), copy into account->user */
   else
   {
@@ -215,6 +217,8 @@ int mutt_account_getpass (ACCOUNT* account)
   else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass)
     strfcpy (account->pass, SmtpPass, sizeof (account->pass));
 #endif
+  else if (option (OPTNOCURSES))
+    return -1;
   else
   {
     snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),