d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a flag, -T, that tells syslogd to always replace the timestamp on

Browse Source 
messages from the network. We already replace malformatted timestamps
and this option lets us replace timestamps that are correctly formatted
but wrong.

PR:		120891
Submitted by:	Thomas Vogt <thomas@bsdunix.ch>
MFC after:	1 week
This commit is contained in:
dwmalone 2008-09-25 09:28:18 +00:00
parent 71c4e3af89
commit 94da79315b
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,11 @@ Do not log messages from remote machines.
If
specified twice, no network socket will be opened at all, which also
disables logging to remote machines.
.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
Unique priority logging.
Only log messages at the specified priority.
@ -308,6 +313,13 @@ will not append to log files that do not exist (unless
option is specified);
therefore, they must be created manually before running
.Nm .
.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.
.Sh FILES
.Bl -tag -width /var/run/syslog.pid -compact
.It Pa /etc/syslog.conf

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

@ -293,6 +293,7 @@ static char bootfile[MAXLINE+1]; /* booted kernel file */
struct allowedpeer *AllowedPeers; /* List of allowed peers */
static int NumAllowed; /* Number of entries in AllowedPeers */
static int RemoteAddDate; /* Always set the date on remote messages */
static int UniquePriority; /* Only log specified priority? */
static int LogFacPri; /* Put facility and priority in log message: */
@ -322,7 +323,7 @@ static void logmsg(int, const char *, const char *, int);
static void log_deadchild(pid_t, int, const char *);
static void markit(void);
static int skip_message(const char *, const char *, int);
static void printline(const char *, char *);
static void printline(const char *, char *, int);
static void printsys(char *);
static int p_open(const char *, pid_t *);
static void readklog(void);
@ -352,7 +353,8 @@ main(int argc, char *argv[])
socklen_t len;
bindhostname = NULL;
while ((ch = getopt(argc, argv, "468Aa:b:cCdf:kl:m:nop:P:sS:uv")) != -1)
while ((ch = getopt(argc, argv, "468Aa:b:cCdf:kl:m:nop:P:sS:Tuv"))
!= -1)
switch (ch) {
case '4':
family = PF_INET;
@ -452,6 +454,9 @@ main(int argc, char *argv[])
errx(1, "%s path too long, exiting", optarg);
funix_secure.name = optarg;
break;
case 'T':
RemoteAddDate = 1;
break;
case 'u': /* only log specified priority */
UniquePriority++;
break;
@ -644,7 +649,7 @@ main(int argc, char *argv[])
hname = cvthname((struct sockaddr *)&frominet);
unmapped((struct sockaddr *)&frominet);
if (validate((struct sockaddr *)&frominet, hname))
printline(hname, line);
printline(hname, line, RemoteAddDate ? ADDDATE : 0);
} else if (l < 0 && errno != EINTR)
logerror("recvfrom inet");
}
@ -657,7 +662,7 @@ main(int argc, char *argv[])
(struct sockaddr *)&fromunix, &len);
if (l > 0) {
line[l] = '\0';
printline(LocalHostName, line);
printline(LocalHostName, line, 0);
} else if (l < 0 && errno != EINTR)
logerror("recvfrom unix");
}
@ -697,7 +702,7 @@ usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n%s\n",
"usage: syslogd [-468ACcdknosuv] [-a allowed_peer]",
"usage: syslogd [-468ACcdknosTuv] [-a allowed_peer]",
" [-b bind_address] [-f config_file]",
" [-l [mode:]path] [-m mark_interval]",
" [-P pid_file] [-p log_socket]");
@ -709,7 +714,7 @@ usage(void)
* on the appropriate log files.
*/
static void
printline(const char *hname, char *msg)
printline(const char *hname, char *msg, int flags)
{
char *p, *q;
long n;
@ -762,7 +767,7 @@ printline(const char *hname, char *msg)
}
*q = '\0';
logmsg(pri, line, hname, 0);
logmsg(pri, line, hname, flags);
}
/*