Merge commit 'refs/merge-requests/4' of gitorious.org:fetchmail/fetchmail into 4...

[~andy/fetchmail] / fetchmail.c

diff --git a/fetchmail.c b/fetchmail.c
index 3eed293f804acc4f2b53bede5cc53af8bbda0a0c..d83da942349030b5847c13a7aa0367d2f5ed53f3 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -921,6 +921,7 @@ static void optmerge(struct query *h2, struct query *h1, int force)
     FLAG_MERGE(server.plugout);
     FLAG_MERGE(server.tracepolls);
     FLAG_MERGE(server.badheader);
+    FLAG_MERGE(server.retrieveerror);
 
     FLAG_MERGE(wildcard);
     FLAG_MERGE(remotename);
@@ -1900,6 +1901,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));