From 49918bae335a135d06d78244a86c941a3bd56bb5 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 15 Dec 2008 00:58:15 +0000 Subject: Fix Debian Bug#508667: do not lose PS_MAXFETCH (13) exit status. Reported by Michelle Konzack. svn path=/branches/BRANCH_6-3/; revision=5255 --- NEWS | 4 ++++ driver.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ebd3beb8..db7497cd 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,10 @@ be removed from a 6.4.0 or newer release.) fetchmail 6.3.10 (not yet released): +# BUGFIXES +* Do not lose PS_MAXFETCH (13) exit status when hitting maxpoll. Reported by + Michelle Konzack, Debian Bug#508667. + # TRANSLATION UPDATES AND ADDITIONS (ordered by language name): * [it] Italian (Vincenzo Campanella) diff --git a/driver.c b/driver.c index 675720a8..14cf8700 100644 --- a/driver.c +++ b/driver.c @@ -1435,9 +1435,11 @@ is restored.")); /* end-of-mailbox processing before we repoll or switch to another one */ if (ctl->server.base_protocol->end_mailbox_poll) { - err = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl); - if (err) + tmperr = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl); + if (tmperr) { + err = tmperr; goto cleanUp; + } } /* Return now if we have reached the fetchlimit */ if (maxfetch && maxfetch <= fetches) -- cgit v1.2.3