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

syslogd: undo regression after r326573

Browse Source 
Restore ability for our syslogd to collect pre-RFC3164 formatted
messages from remote hosts that was broken with r326573.

For example, the line from Cisco SCE8000 splitted for readability:

1130: 03:37:57: %USER-6-PORT_OPERSTATUS_CHANGE_TRAP: CPU#000 trap:link
down EntityAdminState: 4  EntityAlarmStatus: 32

Such line was collected and stored before mentioned change
but silently dropped after that. Now syslogd saves it again.

Note that parsing of RFC5424 format not changed.

MFC after:	1 month
This commit is contained in:
Eugene Grosbein 2021-09-27 14:25:21 +07:00
parent 77087b11e2
commit 3b4cc56e52
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1357,31 +1357,25 @@ parsemsg(const char *from, char *msg)
size_t i;
int pri;
i = -1;
pri = DEFUPRI;
/* Parse PRI. */
if (msg[0] != '<' || !isdigit(msg[1])) {
dprintf("Invalid PRI from %s\n", from);
return;
}
for (i = 2; i <= 4; i++) {
if (msg[i] == '>')
break;
if (!isdigit(msg[i])) {
dprintf("Invalid PRI header from %s\n", from);
return;
if (msg[0] == '<' && isdigit(msg[1])) {
for (i = 2; i <= 4; i++) {
if (msg[i] == '>') {
errno = 0;
n = strtol(msg + 1, &q, 10);
if (errno == 0 && *q == msg[i] && n >= 0 && n <= INT_MAX) {
pri = n;
msg += i + 1;
i = 0;
}
break;
}
}
}
if (msg[i] != '>') {
dprintf("Invalid PRI header from %s\n", from);
return;
}
errno = 0;
n = strtol(msg + 1, &q, 10);
if (errno != 0 || *q != msg[i] || n < 0 || n >= INT_MAX) {
dprintf("Invalid PRI %ld from %s: %s\n",
n, from, strerror(errno));
return;
}
pri = n;
if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
pri = DEFUPRI;
@ -1394,8 +1388,7 @@ parsemsg(const char *from, char *msg)
pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
/* Parse VERSION. */
msg += i + 1;
if (msg[0] == '1' && msg[1] == ' ')
if (i == 0 && msg[0] == '1' && msg[1] == ' ')
parsemsg_rfc5424(from, pri, msg + 2);
else
parsemsg_rfc3164(from, pri, msg);