From 2a6d0943f0b34c984282a211ce9df757628d6112 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Thu, 17 Nov 2005 23:55:23 +0000 Subject: In oversized warning messages, print the account name, too. Fixes Debian Bug#213299. Sunil Shetye. svn path=/trunk/; revision=4456 --- NEWS | 9 +++++---- driver.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 3c350ecb..dac1384e 100644 --- a/NEWS +++ b/NEWS @@ -4,8 +4,8 @@ Fetchmail Release Notes This file is in Unicode charset with UTF-8 encoding. (The `lines' figures total .c, .h, .l, and .y files under version control. -Names in parentheses are the maintainers who handled the respective change. -Abbreviations: MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk) +Abbreviations in parentheses are the maintainers who committed the respective +change. MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk.) fetchmail 6.3.0 (not yet released officially): @@ -123,8 +123,7 @@ fetchmail 6.3.0 (not yet released officially): possibly fixing Red Hat bug #114470. (MA). * Nalin Dahyabhai's patch to use the krb5-config script, if present. Sent by Miloslav Trmac. (MA) -* Nalin Dahyabhai's fix to make rpa.c compile. Sent by Miloslav Trmac. - (MA) +* Nalin Dahyabhai's fix to make rpa.c compile. Sent by Miloslav Trmac. (MA) * Trivial fetchmailconf.man to redirect to fetchmail.1. Reported by Miloslav Trmac. (MA) * Updated and re-enabled Czech translation, by Miloslav Trmac (MA). @@ -299,6 +298,8 @@ fetchmail 6.3.0 (not yet released officially): Adrogué Calveras), Czech [cs] (Miloslav Trmac), German [de] (MA), Spanish (Castilian) [es] (Javier Kohen), French [fr] (MA), Polish [pl] (Jakub Bogusz), Russian [ru] (Pavel Maryanov). +* In oversized warning messages, print the account name, too. Fixes Debian + Bug#213299. Sunil Shetye (MA). # INTERNAL CHANGES * Switched to automake. Matthias Andree. diff --git a/driver.c b/driver.c index c00294ec..71bd72f4 100644 --- a/driver.c +++ b/driver.c @@ -338,12 +338,12 @@ static void send_size_warnings(struct query *ctl) stuff_warning(NULL, ctl, "%s", ""); if (ctl->limitflush) stuff_warning(NULL, ctl, - GT_("The following oversized messages were deleted on the mail server %s:"), - ctl->server.pollname); + GT_("The following oversized messages were deleted on server %s account %s:"), + ctl->server.pollname, ctl->remotename); else stuff_warning(NULL, ctl, - GT_("The following oversized messages remain on the mail server %s:"), - ctl->server.pollname); + GT_("The following oversized messages remain on server %s account %s:"), + ctl->server.pollname, ctl->remotename); stuff_warning(NULL, ctl, "%s", ""); -- cgit v1.2.3