Don't complain about fetchall keep in --dumpconfig mode.

svn path=/branches/BRANCH_6-3/; revision=4586

diff --git a/NEWS b/NEWS
index 51d516b3c39e1d05e6ce12824c7fb12dca4044f4..12a8ce711d2e69e0b75b728534165974755763bf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,8 @@ fetchmail 6.3.2 (to be released):
   - switch back to LMTP after sending a bounce.
   The patch removes the global state variable that was the root of this problem.
   Patch by Sunil Shetye. (MA)
+* Don't complain about fetchall keep in --dumpconfig mode. Bug introduced in
+  6.3.0.  Matthias Andree.
 
 fetchmail 6.3.1 (released 2005-12-19):
 

diff --git a/fetchmail.c b/fetchmail.c
index 9ee0d62734e9f9a383338aa5d791c874df252bc6..d0b55114a2de98844a33c1276946078b3b592c1d 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1242,11 +1242,10 @@ static int load_params(int argc, char **argv, int optind)
             * "I beg to you, have mercy on the we[a]k minds like myself."
             * wrote Pehr Anderson.  Your petition is granted.
             */
-           if (ctl->fetchall && ctl->keep && run.poll_interval && !nodetach)
+           if (ctl->fetchall && ctl->keep && run.poll_interval && !nodetach && !configdump)
            {
                (void) fprintf(stderr,
                               GT_("Both fetchall and keep on in daemon mode is a mistake!\n"));
-               exit(PS_SYNTAX);
            }
        }
     }