diff options
author | Matthias Andree <matthias.andree@gmx.de> | 2005-12-29 00:44:44 +0000 |
---|---|---|
committer | Matthias Andree <matthias.andree@gmx.de> | 2005-12-29 00:44:44 +0000 |
commit | 6f37e1de98acd54c30241a06804101bfc48897d5 (patch) | |
tree | 5055e758607c3bb7e34d070008e0b3e3b439861f | |
parent | 651539fdefdd2db0959b4f0454f8071d548b5bc0 (diff) | |
download | fetchmail-6f37e1de98acd54c30241a06804101bfc48897d5.tar.gz fetchmail-6f37e1de98acd54c30241a06804101bfc48897d5.tar.bz2 fetchmail-6f37e1de98acd54c30241a06804101bfc48897d5.zip |
Don't complain about fetchall keep in --dumpconfig mode.
svn path=/branches/BRANCH_6-3/; revision=4586
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | fetchmail.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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 9ee0d627..d0b55114 100644 --- 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); } } } |