[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-319-gc488b56

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  c488b569fe7f7e6309073acbb7e3950be9fc8a95 (commit)
      from  2e8cad2200e7d1d794a23451d902de5a11528536 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=c488b569fe7f7e6309073acbb7e3950be9fc8a95


commit c488b569fe7f7e6309073acbb7e3950be9fc8a95
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Aug 9 12:11:51 2013 +0200

    syslogd: Elementary fix.

diff --git a/ChangeLog b/ChangeLog
index 672adbe..213dcfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-09  Mats Erik Andersson  <address@hidden>
+
+       * src/syslogd.c (argp_options): Improve `mark' text.
+       (logmsg) [INTERNAL_MARK]: Compute facility from
+       macro INTERNAL_MARK for better consistency.
+
 2013-07-20  Mats Erik Andersson  <address@hidden>
 
        talkd: Small audit of ACL.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index bc20491..2a93dd5 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -3378,7 +3378,7 @@ Forward messages from remote hosts.
 @itemx address@hidden
 @opindex -m
 @opindex --mark
-Specify timestamp interval in logs (0 for no timestamps).
+Specify timestamp interval expressed in minutes (0 for no timestamping).
 
 @item -l @var{hostlist}
 @opindex -l
@@ -3395,8 +3395,14 @@ logging their name.  Multiple lists are allowed.
 
 @command{syslogd} reads its configuration file when it starts up and
 whenever it receives a hangup signal.  The @file{syslog.conf} file is
-the configuration file for the @command{syslogd} program.  It consists
-of lines with two fields: the @dfn{selector} field which specifies the
+the main configuration file for the @command{syslogd} program.
+In addition, the server looks below the directory @file{syslog.d/}
+for further configuration files, making it easy to arrange a common
+set of logging conventions in @file{syslog.conf}, augmented by
+system and service specific drop-in configuration in @file{syslog.d/}.
+
+Each configuration file consists of lines with two fields:
+a @dfn{selector} field which specifies the
 types of messages and priorities to which the line applies, and an
 @dfn{action} field which specifies the action to be taken if a message
 @command{syslogd} receives matches the selection criteria.  The
diff --git a/src/syslogd.c b/src/syslogd.c
index 75a5083..7af10f3 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -345,8 +345,8 @@ static struct argp_option argp_options[] = {
   {"ipany", OPT_IPANY, NULL, 0, "allow transport with IPv4 and IPv6", GRP+1},
   {"bind", 'b', "ADDR", 0, "bind listener to this address/name", GRP+1},
   {"bind-port", 'B', "PORT", 0, "bind listener to this port", GRP+1},
-  {"mark", 'm', "INTVL", 0, "specify timestamp interval in logs (0 for no "
-   "timestamps)", GRP+1},
+  {"mark", 'm', "INTVL", 0, "specify timestamp interval in minutes"
+   " (0 for no timestamping)", GRP+1},
   {"no-detach", 'n', NULL, 0, "do not enter daemon mode", GRP+1},
   {"no-forward", OPT_NO_FORWARD, NULL, 0, "do not forward any messages "
    "(overrides --hop)", GRP+1},
@@ -1188,7 +1188,11 @@ logmsg (int pri, const char *msg, const char *from, int 
flags)
 
   /* Extract facility and priority level.  */
   if (flags & MARK)
+#ifdef INTERNAL_MARK
+    fac = LOG_FAC (INTERNAL_MARK);
+#else
     fac = LOG_NFACILITIES;
+#endif
   else
     fac = LOG_FAC (pri);
   prilev = LOG_PRI (pri);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    6 ++++++
 doc/inetutils.texi |   12 +++++++++---
 src/syslogd.c      |    8 ++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils