Add `set syslog'.

svn path=/trunk/; revision=1059

diff --git a/NEWS b/NEWS
index 94fa89448e1d53ccfedbaf79cf73acf0ed435689..0a023e9c7a50c0682933c954d18db01d8d9fdab3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ every user entry in a multi-user poll declaration.
 
 * Use the libmd functions for md5 under Free BSD?  (Low priority.)
 
+* More log levels?
+
                                Release Notes:
 
 ------------------------------------------------------------------------------
@@ -28,12 +30,12 @@ pl 3.9.7 ():
 * Complain and die if user tries to start fetchmail with options while a
   background fetchmail is running. 
 * Various installation headaches are gone, INSTALL edited accordingly.
-* Treat exim's 501 antispam response as equivalent to 571.  Note: this
-  is temporary.  The right thing is to get exim to return 571; I'm 
-  working on it.
+* Treat exim's 501 and (soon) 550 antispam responses as equivalent to 571.
 * Fess up to sometimes only counting header bytes in the progress messages.
+* Man page updates, including removal of restriction on --syslog.
+* You can now set --syslog in the .fetchmailrc file.
 
-There are 257 people on the fetchmail-friends list.
+There are 252 people on the fetchmail-friends list.
 
 pl 3.9.6 (Wed May 28 18:28:35 EDT 1997):
 * Fix the libc6 configuration stuff (thanks to Jesse Thilo).

diff --git a/fetchmail.man b/fetchmail.man
index b1c737c3f50fc76eb6bb32cf1ec1d7ab8f2055e3..354322aacfa15bf08f2cb9eb0e9c87cf48cf738d 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -453,8 +453,7 @@ This is primarily useful for debugging configurations.
 .PP
 The
 .B --syslog
-option allows you to redirect status and error messages emitted while in
-daemon mode to the
+option allows you to redirect status and error messages emitted to the
 .IR syslog (3)
 system daemon if available.
 Messages are logged with an id of \fBfetchmail\fR, the facility \fBLOG_MAIL\fR,
@@ -756,7 +755,7 @@ ticket at the start of each query instead, and send an arbitrary
 string as the password.
 .PP
 Specifying `kpop' sets POP3 protocol over port 1109 with Kerberos V4
-authentication.  These defaults may be overridden by later options.
+preauthentication.  These defaults may be overridden by later options.
 .PP
 You can use the noise keywords `and', `with',
 \&`has', `wants', and `options' anywhere in an entry to make
@@ -772,12 +771,13 @@ or reverse it by saying `user esr here is eric there'
 .PP
 For backward compatibility, the word `server' is a synonym for `poll'.
 .PP
-There are currently two global option statements; `set logfile = '
+There are currently three global option statements; `set logfile = '
 followed by a string sets the same global specified by --logfile.  A
 command-line --logfile option will override this.  Also, `set daemon'
 sets the poll interval as --daemon does.  This can be overridden by
-a command-line --daemon option; iin particular --daemon 0 can be used 
-to force foreground operation.
+a command-line --daemon option; in particular --daemon 0 can be used 
+to force foreground operation. Finally, `set syslog' set\nds log
+messages to syslogd(8).
 .PP
 Basic format is:
 

diff --git a/rcfile_l.l b/rcfile_l.l
index 3f40f5b902ff3cf4479730095cf72be85802b56a..8005602886d3e40802b4f4221402e8601a800346 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -24,6 +24,7 @@ batchlimit    { return BATCHLIMIT; }
 fetchlimit     { return FETCHLIMIT; }
 logfile                { return LOGFILE; }
 daemon         { return DAEMON; }
+syslog         { return SYSLOG; }
 
 defaults       { return DEFAULTS; }
 server                 { return POLL; }

diff --git a/rcfile_y.y b/rcfile_y.y
index 11bd6419da5be3835db0828855e7e609737bb048..8b8cbc8219f71112e405e04eafd98fe162fdbed3 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -49,7 +49,7 @@ extern char * yytext;
 %token AUTHENTICATE TIMEOUT KPOP KERBEROS4
 %token ENVELOPE USERNAME PASSWORD FOLDER SMTPHOST MDA PRECONNECT LIMIT
 %token IS HERE THERE TO MAP WILDCARD
-%token SET BATCHLIMIT FETCHLIMIT LOGFILE DAEMON INTERFACE MONITOR
+%token SET BATCHLIMIT FETCHLIMIT LOGFILE DAEMON SYSLOG INTERFACE MONITOR
 %token <proto> PROTO
 %token <sval>  STRING
 %token <number> NUMBER
@@ -68,6 +68,7 @@ statement_list        : statement
 /* future global options should also have the form SET <name> <value> */
 statement      : SET LOGFILE MAP STRING        {logfile = xstrdup($4);}
                | SET DAEMON NUMBER             {poll_interval = $3;}
+               | SET SYSLOG                    {use_syslog = TRUE;}
 
 /* 
  * The way the next two productions are written depends on the fact that

diff --git a/sample.rcfile b/sample.rcfile
index 5023f60c076682ff1dc36cfb3c9d852ddaf34448..288bdf12c40f28a3a485167a409336c49f986027 100644 (file)
--- a/sample.rcfile
+++ b/sample.rcfile
@@ -76,7 +76,8 @@
 # Legal global option statements are
 #
 #   set logfile =              -- must be followed by a string
-#   set daemon =               -- must be followed by a number   
+#   set daemon                 -- must be followed by a number   
+#   set syslog
 #
 # The noise keywords `and', `with', `has', `wants', and `options' are ignored
 # anywhere in an entry; they can be used to make it resemble English.  The