diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2018-04-06 16:24:03 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2018-04-06 16:24:03 +0000 |
| commit | 10b154332d7214fb199e7ffb1d73a444562223de (patch) | |
| tree | 36c772b4b83552de4dd6eb94b671eb1bb6fbc82a /usr.sbin/syslogd | |
| parent | e0f92f5c779f8624f21dcf89ec0f28c32d9e196a (diff) | |
| download | src-10b154332d7214fb199e7ffb1d73a444562223de.tar.gz src-10b154332d7214fb199e7ffb1d73a444562223de.zip | |
Properly respect the passed in hostname for RFC 5424 messages.
Only override the hostname in case none is provided or when remote
hostnames should be ignored.
Notes
Notes:
svn path=/head/; revision=332110
Diffstat (limited to 'usr.sbin/syslogd')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 552f7a372b13..3a287d77ff44 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1028,6 +1028,8 @@ parsemsg_rfc5424(const char *from, int pri, char *msg) msg[-1] = '\0'; \ } PARSE_STRING("HOSTNAME", hostname); + if (hostname == NULL || !RemoteHostname) + hostname = from; PARSE_STRING("APP-NAME", app_name); PARSE_STRING("PROCID", procid); PARSE_STRING("MSGID", msgid); @@ -1079,7 +1081,7 @@ parsemsg_rfc5424(const char *from, int pri, char *msg) #undef IF_NOT_NILVALUE parsemsg_remove_unsafe_characters(msg, line, sizeof(line)); - logmsg(pri, timestamp, from, app_name, procid, msgid, + logmsg(pri, timestamp, hostname, app_name, procid, msgid, structured_data, line, 0); } |