Added retrieve-error policy to dump_params.

Added documentation of retrieve-error policy.

diff --git a/NEWS b/NEWS
index 46658db7f20298eb0d5ad3ec94a1bc6330efef87..15d118537ef69d2a02f656c9e965d12a1342b99c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,16 @@ removed from a 6.4.0 or newer release.)
 
 fetchmail-6.3.18 (not yet released):
 
+# FEATURE
+* Fetchmail now supports a retrieve-error command line or rcfile option that
+  takes exactly one argument, abort (default), continue or markseen.  This
+  specifies the policy used by fetchmail to handle messages whose bodies
+  fail to be retrieved due to server errors.  Both the continue and markseen
+  options will skip the message with errors and allow the session to
+  continue so that subsequent messages can be retrieved.  The markseen
+  option will also mark the message with errors as seen.  The default policy
+  is to abort the session whenever a server error occurs.
+
 # BUG FIXES
 * Fetchmail would warn about insecure SSL/TLS connections even if a matching
   --sslfingerprint was specified. This is an omission from an SSL usability

diff --git a/fetchmail.c b/fetchmail.c
index 84140e3cc4b3f5879ecd60193f444bce962a6d45..fd854e60df2ad3da6483b6011631bb7f432faf34 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1975,6 +1975,19 @@ static void dump_params (struct runctl *runp,
                break;
        }
 
+       switch (ctl->server.retrieveerror) {
+           case RE_ABORT:
+               if (outlevel >= O_VERBOSE)
+                   printf(GT_("  Messages with fetch body errors will cause the session to abort.\n"));
+               break;
+           case RE_CONTINUE:
+               printf(GT_("  Messages with fetch body errors will be skipped, the session will continue.\n"));
+               break;
+           case RE_MARKSEEN:
+               printf(GT_("  Messages with fetch body errors will be marked seen, the session will continue.\n"));
+               break;
+       }
+
        if (ctl->properties)
            printf(GT_("  Pass-through properties \"%s\".\n"),
                   visbuf(ctl->properties));

diff --git a/fetchmail.man b/fetchmail.man
index a6a6fe5f745f5ad6221a294519be0a9108dee7e8..c354c97ce087d80ba518d782da5a79734ebddf32 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -738,6 +738,17 @@ Specify how fetchmail is supposed to treat messages with bad headers,
 i. e. headers with bad syntax. Traditionally, fetchmail has rejected such
 messages, but some distributors modified fetchmail to accept them. You can now
 configure fetchmail's behaviour per server.
+.TP
+.B \-\-retrieve\-error {abort|continue|markseen}
+(Keyword: retrieve\-error; since v6.4)
+.br
+Specify how fetchmail is supposed to treat messages which fail to be
+retrieved due to server errors, i. e. fetching the message body fails with
+a server error. Traditionally, fetchmail has aborted the session leaving
+both the message with the error and any subsequent messages on the server.
+Both the continue and markseen options will allow the session to continue
+enabling subsequent messages on the server to be retrieved.  You can now
+configure fetchmail's behaviour per server.
 
 .SS Resource Limit Control Options
 .TP
@@ -1801,6 +1812,10 @@ T}
 bad-header     \&      \&      T{
 How to treat messages with a bad header. Can be reject (default) or accept.
 T}
+retrieve-error \&      \&      T{
+How to behave when messages that cannot be retrieved due to a server error
+are encountered. Can be abort (default), continue or markseen.
+T}
 .TE
 
 Here are the legal user descriptions and options: