diff options
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | fetchmail.c | 4 | ||||
| -rw-r--r-- | fetchmail.man | 8 | ||||
| -rw-r--r-- | options.c | 12 |
4 files changed, 17 insertions, 19 deletions
@@ -7,14 +7,20 @@ generates a warning to standard error. In a future release, probably 4.0, this hack will be removed and the leading `username' token required for every user entry in a multi-user poll declaration. - Release Notes: + Release Notes: ------------------------------------------------------------------------------ -pl 3.9.1 (Fri Apr 4 17:24:14 EST 1997): +pl 3.9.1 (Sat Apr 5 14:22:16 EST 1997): * Hypertext FAQ added to distribution manifest. * RPM builder production fixed. -* Minor additions to man page. +* Minor additions and corrections to man page. +* Delivery failures are now syslogged as LOG_ERR, not LOG_INFO. +* --check now turns off --daemon. +* --syslog is now independent of --daemon. + +There are 246 people on the fetchmail-friends list. +(24 bad addresses were dropped) ------------------------------------------------------------------------------ fetchmail-3.9 (Wed Apr 2 13:36:22 EST 1997) diff --git a/fetchmail.c b/fetchmail.c index ce301534..ea5888ce 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -671,6 +671,10 @@ static int load_params(int argc, char **argv, int optind) if (cmd_daemon >= 0) poll_interval = cmd_daemon; + /* check and daemon options are not compatible */ + if (check_only && poll_interval) + poll_interval = 0; + return(implicitmode); } diff --git a/fetchmail.man b/fetchmail.man index 172e676b..b5608919 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -81,10 +81,10 @@ options are set the way you want them. .B \-c, --check Return a status code to indicate whether there is mail waiting, without actually fetching or deleting mail (see EXIT CODES below). -This option doesn't play well with queries to multiple sites, doen't -work with ETRN, and is ignored in daemon mode. It's also prone to -false positives if you leave read but undeleted mail in your server -mailbox. +This option turns off daemon mode (in which it would be useless). It +doesn't play well with queries to multiple sites, and doesn't work +with ETRN. It's also prone to false positives if you leave read but +undeleted mail in your server mailbox. .TP .B \-s, --silent Silent mode. Suppresses all progress/status messages that are normally @@ -301,18 +301,6 @@ struct query *ctl; /* option record to be initialized */ } } - if (check_only && poll_interval) - { - fputs("The --check and --daemon options aren't compatible.\n", stderr); - return(-1); - } - - if ((poll_interval == 0 || nodetach) && use_syslog) - { - fputs("The --syslog option is only valid when running detached.\n", stderr); - return(-1); - } - if (errflag || ocount > 1) { /* squawk if syntax errors were detected */ fputs("usage: fetchmail [options] [server ...]\n", stderr); |