aboutsummaryrefslogtreecommitdiffstats
path: root/driver.c
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2005-11-10 01:20:42 +0000
committerMatthias Andree <matthias.andree@gmx.de>2005-11-10 01:20:42 +0000
commit49fcd4b33bea7a4afc515dfbcac4d49a8e22196a (patch)
treeb4fc660a817e25702d40f1a088c207602ef9c184 /driver.c
parentb538653d865d6fdd45d192a8fcdf652d5f7a7b48 (diff)
downloadfetchmail-49fcd4b33bea7a4afc515dfbcac4d49a8e22196a.tar.gz
fetchmail-49fcd4b33bea7a4afc515dfbcac4d49a8e22196a.tar.bz2
fetchmail-49fcd4b33bea7a4afc515dfbcac4d49a8e22196a.zip
Revise some error messages so they are less confusing. Sunil Shetye.
svn path=/trunk/; revision=4401
Diffstat (limited to 'driver.c')
-rw-r--r--driver.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/driver.c b/driver.c
index f978c341..c00294ec 100644
--- a/driver.c
+++ b/driver.c
@@ -1510,13 +1510,14 @@ is restored."));
break;
}
if (msg) {
- const char *stem;
-
- if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT)
- stem = GT_("%s error while delivering to SMTP host %s\n");
+ if (phase == FORWARDING_WAIT || phase == LISTENER_WAIT
+ || err == PS_SMTP)
+ report(stderr, GT_("%s error while fetching from %s@%s and delivering to SMTP host %s\n"),
+ msg, ctl->remotename, ctl->server.pollname,
+ ctl->smtphost ? ctl->smtphost : GT_("unknown"));
else
- stem = GT_("%s error while fetching from %s\n");
- report(stderr, stem, msg, ctl->server.pollname);
+ report(stderr, GT_("%s error while fetching from %s@%s\n"),
+ msg, ctl->remotename, ctl->server.pollname);
}
closeUp: