summaryrefslogtreecommitdiffstats
path: root/usr.sbin/syslogd
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2019-01-13 10:42:51 +0000
committerschwarze <schwarze@openbsd.org>2019-01-13 10:42:51 +0000
commit14091971524e70deb1c6ba048d148a62d09c31d1 (patch)
tree4bebd4ca1df6be39a8b0cbb999727df10c94d1a7 /usr.sbin/syslogd
parentCheck for the CPU architecture and not the system architecture when (diff)
downloadwireguard-openbsd-14091971524e70deb1c6ba048d148a62d09c31d1.tar.xz
wireguard-openbsd-14091971524e70deb1c6ba048d148a62d09c31d1.zip
When parsing log lines in order to select syslog.conf(5) line blocks, support
program names containing period ('.') and underscore ('_') ASCII characters. Missing feature reported by and patch tested by Kawashima underscore James at yahoo dot co dot jp. "Makes sense." deraadt@
Diffstat (limited to 'usr.sbin/syslogd')
-rw-r--r--usr.sbin/syslogd/syslogd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 207eea429d0..c0ce551e48e 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syslogd.c,v 1.257 2018/11/29 21:10:51 kn Exp $ */
+/* $OpenBSD: syslogd.c,v 1.258 2019/01/13 10:42:51 schwarze Exp $ */
/*
* Copyright (c) 2014-2017 Alexander Bluhm <bluhm@genua.de>
@@ -1796,7 +1796,8 @@ logline(int pri, int flags, char *from, char *msg)
msglen--;
}
for (i = 0; i < NAME_MAX; i++) {
- if (!isalnum((unsigned char)msg[i]) && msg[i] != '-')
+ if (!isalnum((unsigned char)msg[i]) &&
+ msg[i] != '-' && msg[i] != '.' && msg[i] != '_')
break;
prog[i] = msg[i];
}