diff options
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | fetchmail.c | 20 |
2 files changed, 16 insertions, 9 deletions
@@ -1,5 +1,10 @@ Release Notes: +fetchmail-4.7.0 ()): +* Minor correction to make i18n subdirectory builds work better. +* Rob Funk's old-message-check optimization. +* Fix an error in the logic for detecting when all connections are wedged. + fetchmail-4.6.9 (Tue Dec 1 14:46:19 EST 1998): * Better RFC822 conformance in fetchmail trace headers. * Corrected MIME generation of bounce mail. diff --git a/fetchmail.c b/fetchmail.c index 7d368e1b..06daa86d 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -513,15 +513,16 @@ int main (int argc, char **argv) batchcount = 0; for (ctl = querylist; ctl; ctl = ctl->next) { - if (ctl->wedged) - { - error(0, -1, - _("poll of %s skipped (failed authentication or too many timeouts)"), - ctl->server.pollname); - continue; - } if (ctl->active && !(implicitmode && ctl->server.skip)) { + if (ctl->wedged) + { + error(0, -1, + _("poll of %s skipped (failed authentication or too many timeouts)"), + ctl->server.pollname); + continue; + } + /* check skip interval first so that it counts all polls */ if (run.poll_interval && ctl->server.interval) { @@ -614,8 +615,9 @@ int main (int argc, char **argv) int unwedged = 0; for (ctl = querylist; ctl; ctl = ctl->next) - if (!ctl->wedged) - unwedged++; + if (ctl->active && !(implicitmode && ctl->server.skip)) + if (!ctl->wedged) + unwedged++; if (!unwedged) { error(0, -1, _("All connections are wedged. Exiting.")); |