breeze/inetutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/inetutils.git synced 2026-01-12 00:19:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

syslogd: Elementary fix.

Browse Source
This commit is contained in:
Mats Erik Andersson
2013-08-09 12:11:51 +02:00
parent 2e8cad2200
commit c488b569fe
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2013-08-09 Mats Erik Andersson <gnu@gisladisker.se>
* 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 <gnu@gisladisker.se>
talkd: Small audit of ACL.

12
doc/inetutils.texi
View File

@@ -3378,7 +3378,7 @@ Forward messages from remote hosts.
@itemx --mark=@var{interval}
@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

8
src/syslogd.c
View File

@@ -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);