diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2004-12-28 21:58:54 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2004-12-28 21:58:54 +0000 |
| commit | f5cc9e76634458c8a772ad2cf9c1d9dd5e589a4d (patch) | |
| tree | 2f0b2b445ad6603d91d0c0df03dc4730fee153f1 /usr.sbin/syslogd | |
| parent | 19556523263f5fad19cc6f2fe189270919473302 (diff) | |
| download | FreeBSD-src-f5cc9e76634458c8a772ad2cf9c1d9dd5e589a4d.zip FreeBSD-src-f5cc9e76634458c8a772ad2cf9c1d9dd5e589a4d.tar.gz | |
Some syslog messages delimit the program tag with whitespace rather
than a colon, so don't allow whitespace in program names. To be
consistent with hostnames, don't allow whitespace in the program
name specifiers in syslog.conf either.
(The first change is by Markus from the PR, the second is mine.)
PR: 68691
Submitted by: Markus Oestreicher <m.oe@x-trader.de>
MFC after: 3 weeks
Diffstat (limited to 'usr.sbin/syslogd')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index e9059b8..2dfd1fb 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -921,7 +921,7 @@ logmsg(int pri, const char *msg, const char *from, int flags) /* extract program name */ for (i = 0; i < NAME_MAX; i++) { if (!isprint(msg[i]) || msg[i] == ':' || msg[i] == '[' || - msg[i] == '/') + msg[i] == '/' || isspace(msg[i])) break; prog[i] = msg[i]; } @@ -1608,7 +1608,7 @@ init(int signo) continue; } for (i = 0; i < NAME_MAX; i++) { - if (!isprint(p[i])) + if (!isprint(p[i]) || isspace(p[i])) break; prog[i] = p[i]; } |
