Wakeup clears `wedged' flags.

svn path=/trunk/; revision=2261

diff --git a/NEWS b/NEWS
index aa6b0f949df86e6fa9eb6848cc3f6f2c054cad07..20c55da4dd7c08ec630b4501cc46909ac365ae68 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ 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.
+* Unwedge connections on wakeup.
 
 fetchmail-4.6.9 (Tue Dec  1 14:46:19 EST 1998):
 * Better RFC822 conformance in fetchmail trace headers.

diff --git a/fetchmail.c b/fetchmail.c
index 0b62590edc56aa05724bac91e9a4b7291f07a58f..a3a4190dc6ae440848f222dc86498d28629c316a 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -722,6 +722,10 @@ int main (int argc, char **argv)
 #else
                    error(0, 0, _("awakened by signal %d"), lastsig);
 #endif
+                   /* received a wakeup - unwedge all servers in case */
+                   /* the problem has been manually repaired          */
+                   for (ctl = querylist; ctl; ctl = ctl->next)
+                       ctl->wedged = FALSE;
                }
            }
 

diff --git a/fetchmail.man b/fetchmail.man
index 18875817b5443bd80101fb130b305df4e854fc22..92218dc3a5d4b78c554c9b6b43e9aa52f4ee5790 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -224,7 +224,9 @@ or respond to commands for the given number of seconds,
 \fIfetchmail\fR might hang up indefinitely trying to fetch mail from a
 down host.  This would be particularly annoying for a \fIfetchmail\fR
 running in background.  There is a default timeout which fetchmail -V
-will report.
+will report.  If a given connection receives too many timeouts in 
+succession, fetchmail will consider it wedged and stop retrying,
+the calkling user will be notified by email if this happens.
 .TP
 .B \--plugin
 (Keyword: plugin)
@@ -670,7 +672,9 @@ makes a per-user lockfile to guarantee this.
 Normally, calling fetchmail with a daemon in the background sends a
 wakeup signal to the daemon, forcing it to poll mailservers
 immediately.  (The wakeup signal is SIGHUP if fetchmail is running as
-root, SIGUSR1 otherwise.)
+root, SIGUSR1 otherwise.)  The wakeup action also clears any `wedged'
+flags indicating that connections have wedged due to failed 
+authentication or multiple timeouts.
 .PP
 The option
 .B --quit