emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd.c parsemsg_rfc3164(): don't set buffer.timestamp.usec when RemoteAddDate

Browse Source 
(-T) -- fixes changes in 8f8332885 that resulted in "Jan 0 00:00:00" timestamps.
check_timestamp() saw the nonzero timestamp.usec and returned without setting
buffer->timestamp, leaving it with nonzero usecs and an all-zeros struct tm.
This commit is contained in:
Daniel Pouzzner 2022-08-13 11:58:32 -05:00
parent ba9555870b
commit 55b8d3ddfa
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/syslogd.c
View File

@ -1159,20 +1159,20 @@ parsemsg_rfc3164(const char *from, int pri, char *msg)
*/ */
if (strptime(msg, RFC3164_DATEFMT, &tm_parsed) == if (strptime(msg, RFC3164_DATEFMT, &tm_parsed) ==
msg + RFC3164_DATELEN && msg[RFC3164_DATELEN] == ' ') { msg + RFC3164_DATELEN && msg[RFC3164_DATELEN] == ' ') {
struct timeval tv;
msg += RFC3164_DATELEN + 1; msg += RFC3164_DATELEN + 1;
if (gettimeofday(&tv, NULL) == -1) {
tv.tv_sec = time(NULL);
tv.tv_usec = 0;
}
if (!RemoteAddDate) { if (!RemoteAddDate) {
time_t t_now, t_remote; struct timeval tv;
time_t t_remote;
struct tm tm_now; struct tm tm_now;
int year; int year;
if (gettimeofday(&tv, NULL) == -1) {
tv.tv_sec = time(NULL);
tv.tv_usec = 0;
}
/* /*
* As the timestamp does not contain the year * As the timestamp does not contain the year
* number, daylight saving time information, nor * number, daylight saving time information, nor
@ -1185,24 +1185,21 @@ parsemsg_rfc3164(const char *from, int pri, char *msg)
* This loop can only run for at most three * This loop can only run for at most three
* iterations before terminating. * iterations before terminating.
*/ */
t_now = time(NULL); localtime_r(&tv.tv_sec, &tm_now);
localtime_r(&t_now, &tm_now);
for (year = tm_now.tm_year + 1;; --year) { for (year = tm_now.tm_year + 1;; --year) {
if (year < tm_now.tm_year - 1) if (year < tm_now.tm_year - 1)
break; break;
timestamp_remote.tm = tm_parsed; timestamp_remote.tm = tm_parsed;
timestamp_remote.tm.tm_year = year; timestamp_remote.tm.tm_year = year;
timestamp_remote.tm.tm_isdst = -1; timestamp_remote.tm.tm_isdst = -1;
timestamp_remote.usec = 0;
t_remote = mktime(&timestamp_remote.tm); t_remote = mktime(&timestamp_remote.tm);
if ((t_remote != (time_t)-1) && if ((t_remote != (time_t)-1) &&
(t_remote - t_now) < 7 * 24 * 60 * 60) (t_remote - tv.tv_sec) < 7 * 24 * 60 * 60)
break; break;
} }
buffer.timestamp = timestamp_remote; buffer.timestamp = timestamp_remote;
buffer.timestamp.usec = tv.tv_usec;
} }
buffer.timestamp.usec = tv.tv_usec;
} }
/* /*