Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR 32579: Add a -T flag to syslogd, which causes it to use local time for 

messages received from the network. Useful for collecting logs from
devices which do not have correct time.

Add it to usage.

Document it, also document that syslogd adds a timestamp with the local
time if it does not recognize the original timestamp field. Bump date.

Approved by wrstuden@.
This commit is contained in:
pavel 2006-04-19 21:18:50 +00:00
parent 36c96e27d5
commit 43bd0b5956
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/syslogd/syslogd.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: syslogd.8,v 1.38 2006/01/20 21:48:41 wiz Exp $
.\" $NetBSD: syslogd.8,v 1.39 2006/04/19 21:18:50 pavel Exp $
.\"
.\" Copyright (c) 1983, 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -29,7 +29,7 @@
.\"
.\" from: @(#)syslogd.8 8.1 (Berkeley) 6/6/93
.\"
.Dd January 20, 2006
.Dd April 19, 2006
.Dt SYSLOGD 8
.Os
.Sh NAME
@ -123,6 +123,12 @@ and similar attacks.
to
.Ar chroot_dir
after the sockets and log files have been opened.
.It Fl T
Always use the local time and date for messages received from the
network, instead of the timestamp field supplied in the message
by the remote host.
This is useful if some of the originating hosts can't keep time
properly or are unable to generate a correct timestamp.
.It Fl u Ar user
Set UID to
.Ar user
@ -188,6 +194,13 @@ The logged message includes the date, time, and hostname (or pathname of
the log socket).
Commonly, the program name and the process id is included.
.Pp
The date and time are taken from the received message.
If the format of the timestamp field is incorrect, time obtained from
the local host is used instead.
This can be overriden by the
.Fl T
flag.
.Pp
Accesses from UDP socket can be filtered by libwrap configuration files, like
.Pa /etc/hosts.deny .
Specify

23
usr.sbin/syslogd/syslogd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslogd.c,v 1.76 2005/06/02 09:42:57 lukem Exp $ */
/* $NetBSD: syslogd.c,v 1.77 2006/04/19 21:18:50 pavel Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
__RCSID("$NetBSD: syslogd.c,v 1.76 2005/06/02 09:42:57 lukem Exp $");
__RCSID("$NetBSD: syslogd.c,v 1.77 2006/04/19 21:18:50 pavel Exp $");
#endif
#endif /* not lint */
@ -242,6 +242,7 @@ int UseNameService = 1; /* make domain name queries */
int NumForwards = 0; /* number of forwarding actions in conf file */
char **LogPaths; /* array of pathnames to read messages from */
int NoRepeat = 0; /* disable "repeated"; log always */
int RemoteAddDate = 0; /* always add date to messages from network */
int SyncKernel = 0; /* write kernel messages synchronously */
int UniquePriority = 0; /* only log specified priority */
int LogFacPri = 0; /* put facility and priority in log messages: */
@ -263,7 +264,7 @@ void logmsg(int, char *, char *, int);
void log_deadchild(pid_t, int, const char *);
int matches_spec(const char *, const char *,
char *(*)(const char *, const char *));
void printline(char *, char *);
void printline(char *, char *, int);
void printsys(char *);
int p_open(char *, pid_t *);
void trim_localdomain(char *);
@ -313,7 +314,7 @@ main(int argc, char *argv[])
(void)setlocale(LC_ALL, "");
while ((ch = getopt(argc, argv, "dnsSf:m:p:P:ru:g:t:Uv")) != -1)
while ((ch = getopt(argc, argv, "dnsSf:m:p:P:ru:g:t:TUv")) != -1)
switch(ch) {
case 'd': /* debug */
Debug++;
@ -354,6 +355,9 @@ main(int argc, char *argv[])
if (*root == '\0')
usage();
break;
case 'T':
RemoteAddDate = 1;
break;
case 'u':
user = optarg;
if (*user == '\0')
@ -601,7 +605,7 @@ usage(void)
{
(void)fprintf(stderr,
"usage: %s [-dnrSsUv] [-f config_file] [-g group] [-m mark_interval]\n"
"usage: %s [-dnrSsTUv] [-f config_file] [-g group] [-m mark_interval]\n"
"\t[-P file_list] [-p log_socket [-p log_socket2 ...]]\n"
"\t[-t chroot_dir] [-u user]\n", getprogname());
exit(1);
@ -665,7 +669,7 @@ dispatch_read_funix(struct kevent *ev)
(struct sockaddr *)&fromunix, &sunlen);
if (rv > 0) {
linebuf[rv] = '\0';
printline(LocalHostName, linebuf);
printline(LocalHostName, linebuf, 0);
} else if (rv < 0 && errno != EINTR) {
logerror("recvfrom() unix `%s'", myname.sun_path);
}
@ -708,7 +712,8 @@ dispatch_read_finet(struct kevent *ev)
linebuf[rv] = '\0';
if (!reject)
printline(cvthname(&frominet), linebuf);
printline(cvthname(&frominet), linebuf,
RemoteAddDate ? ADDDATE : 0);
}
/*
@ -770,7 +775,7 @@ logpath_fileadd(char ***lp, int *szp, int *maxszp, char *file)
* on the appropriate log files.
*/
void
printline(char *hname, char *msg)
printline(char *hname, char *msg, int flags)
{
int c, pri;
char *p, *q, line[MAXLINE + 1];
@ -817,7 +822,7 @@ printline(char *hname, char *msg)
}
*q = '\0';
logmsg(pri, line, hname, 0);
logmsg(pri, line, hname, flags);
}
/*