| 1 |
grobian 09/07/02 08:44:34 |
| 2 |
|
| 3 |
Added: |
| 4 |
mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch |
| 5 |
Log: |
| 6 |
Bump for patch to fix bug #276101, regarding smtp batching with authentication. |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch |
| 16 |
=================================================================== |
| 17 |
http://dev.mutt.org/trac/changeset/0a3de4d9a009 |
| 18 |
|
| 19 |
SMTP: use $smtp_pass in batch mode. Closes #3289. |
| 20 |
|
| 21 |
mutt_account_getpass() copying the password from $smtp_pass into the |
| 22 |
account structure is only called from the SASL callback we only use if |
| 23 |
we're sure we don't need curses (i.e. have the pass already). |
| 24 |
|
| 25 |
http://dev.mutt.org/trac/changeset/f6c6066a5925 |
| 26 |
|
| 27 |
Make getuser/pass abort if input is required in batch mode. |
| 28 |
Replaces [0a3de4d9a009]. See #3289. |
| 29 |
|
| 30 |
|
| 31 |
Index: account.c |
| 32 |
=================================================================== |
| 33 |
--- account.c (revision 5557:6c58b678d360) |
| 34 |
+++ account.c (revision 5965:f6c6066a5925) |
| 35 |
@@ -156,4 +156,6 @@ |
| 36 |
strfcpy (account->user, PopUser, sizeof (account->user)); |
| 37 |
#endif |
| 38 |
+ else if (option (OPTNOCURSES)) |
| 39 |
+ return -1; |
| 40 |
/* prompt (defaults to unix username), copy into account->user */ |
| 41 |
else |
| 42 |
@@ -216,4 +218,6 @@ |
| 43 |
strfcpy (account->pass, SmtpPass, sizeof (account->pass)); |
| 44 |
#endif |
| 45 |
+ else if (option (OPTNOCURSES)) |
| 46 |
+ return -1; |
| 47 |
else |
| 48 |
{ |
| 49 |
Index: mutt_sasl.c |
| 50 |
=================================================================== |
| 51 |
--- mutt_sasl.c (revision 5711:6fac57b97bf1) |
| 52 |
+++ mutt_sasl.c (revision 5965:f6c6066a5925) |
| 53 |
@@ -305,5 +305,5 @@ |
| 54 |
snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt); |
| 55 |
resp[0] = '\0'; |
| 56 |
- if (mutt_get_field (prompt, resp, sizeof (resp), 0)) |
| 57 |
+ if (option (OPTNOCURSES) || mutt_get_field (prompt, resp, sizeof (resp), 0)) |
| 58 |
return SASL_FAIL; |
| 59 |
|
| 60 |
Index: smtp.c |
| 61 |
=================================================================== |
| 62 |
--- smtp.c (revision 5963:0a3de4d9a009) |
| 63 |
+++ smtp.c (revision 5965:f6c6066a5925) |
| 64 |
@@ -173,5 +173,5 @@ |
| 65 |
struct stat st; |
| 66 |
int r, term = 0; |
| 67 |
- size_t buflen; |
| 68 |
+ size_t buflen = 0; |
| 69 |
|
| 70 |
fp = fopen (msgfile, "r"); |
| 71 |
@@ -461,10 +455,4 @@ |
| 72 |
|
| 73 |
#ifdef USE_SASL |
| 74 |
- if (!(conn->account.flags & M_ACCT_PASS) && option (OPTNOCURSES)) |
| 75 |
- { |
| 76 |
- mutt_error (_("Interactive SMTP authentication not supported")); |
| 77 |
- mutt_sleep (1); |
| 78 |
- return -1; |
| 79 |
- } |
| 80 |
return smtp_auth (conn); |
| 81 |
#else |
| 82 |
@@ -610,5 +598,5 @@ |
| 83 |
} |
| 84 |
strfcpy (buf + len, "\r\n", sizeof (buf) - len); |
| 85 |
- } while (rc == smtp_ready); |
| 86 |
+ } while (rc == smtp_ready && saslrc != SASL_FAIL); |
| 87 |
|
| 88 |
if (smtp_success (rc)) |
Archives