diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-01-26 18:07:19 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2016-01-26 18:07:19 +0100 |
| commit | cfd77192c1de3bd264d15d6f4d8b3117f5619f4f (patch) | |
| tree | 2534573f6826eac1ed2bdebfbff27ac07609cf44 /src/journal | |
| parent | 3820ed90335211dc208b048f1ff48ae66940ce3b (diff) | |
| parent | 4850d39ab72e7cb00a6e9c9aa4745c997674efa6 (diff) | |
Merge pull request #2437 from poettering/dnssec19
nineteenth dnssec patch
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/coredump.c | 2 | ||||
| -rw-r--r-- | src/journal/journal-send.c | 1 | ||||
| -rw-r--r-- | src/journal/journald-audit.c | 4 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c index 7df59fe29b..8298b02439 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -794,6 +794,8 @@ int main(int argc, char* argv[]) { IOVEC_SET_STRING(iovec[j++], core_timestamp); IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1"); + + assert_cc(2 == LOG_CRIT); IOVEC_SET_STRING(iovec[j++], "PRIORITY=2"); /* Vacuum before we write anything again */ diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 44fa11a00e..def4caab92 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -372,6 +372,7 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove xsprintf(error, "ERRNO=%i", _saved_errno_); + assert_cc(3 == LOG_ERR); IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3"); IOVEC_SET_STRING(iov[skip+1], buffer); IOVEC_SET_STRING(iov[skip+2], error); diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 3c13fe0d67..28970131e7 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -397,8 +397,8 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s sprintf(id_field, "_AUDIT_ID=%" PRIu64, id); IOVEC_SET_STRING(iov[n_iov++], id_field); - assert_cc(32 == LOG_AUTH); - IOVEC_SET_STRING(iov[n_iov++], "SYSLOG_FACILITY=32"); + assert_cc(4 == LOG_FAC(LOG_AUTH)); + IOVEC_SET_STRING(iov[n_iov++], "SYSLOG_FACILITY=4"); IOVEC_SET_STRING(iov[n_iov++], "SYSLOG_IDENTIFIER=audit"); type_name = audit_type_name_alloca(type); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 8c1b064e86..fd802b4461 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -866,10 +866,12 @@ void server_driver_message(Server *s, sd_id128_t message_id, const char *format, assert(s); assert(format); + assert_cc(3 == LOG_FAC(LOG_DAEMON)); IOVEC_SET_STRING(iovec[n++], "SYSLOG_FACILITY=3"); IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=systemd-journald"); IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=driver"); + assert_cc(6 == LOG_INFO); IOVEC_SET_STRING(iovec[n++], "PRIORITY=6"); if (!sd_id128_equal(message_id, SD_ID128_NULL)) { |