aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--driver.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f29fc9dc..7ad4d072 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,12 @@
(The `lines' figures total .c, .h, .l, and .y files under version control.)
+* Fixed locale setting; this should make i18n actually work.
* Don't issue AUTH between USER and PASS, some servers choke on this.
* Resolved Debian bug #85772 re Kerberos compilation.
+* Resolved Debian bug ##85961: Wrong error message when local connection fails.
+* Serious pre-release regression testing begins. This version tested
+ against 18 different POP3 and IMAP server tests.
fetchmail-5.6.5 (Mon Feb 12 04:33:39 EST 2001), 20062 lines:
diff --git a/driver.c b/driver.c
index ee4d3e5f..47141b1a 100644
--- a/driver.c
+++ b/driver.c
@@ -2416,7 +2416,15 @@ is restored."));
if (ok==PS_SOCKET || ok==PS_SYNTAX
|| ok==PS_IOERR || ok==PS_ERROR || ok==PS_PROTOCOL
|| ok==PS_LOCKBUSY || ok==PS_SMTP || ok==PS_DNS)
- report(stderr, _("%s error while fetching from %s\n"), msg, ctl->server.pollname);
+ {
+ char *stem;
+
+ if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT)
+ stem = _("%s error while fetching from %s\n");
+ else
+ stem = _("%s error while delivering to SMTP host %s\n");
+ report(stderr, stem, msg, ctl->server.pollname);
+ }
closeUp:
/* execute post-initialization command, if any */