|
 |
39f05ae |
From 5effc9d297ec021e41a87434799d2332fc4946c8 Mon Sep 17 00:00:00 2001
|
|
|
39f05ae |
From: Mirco Tischler <mt-ml@gmx.de>
|
|
|
39f05ae |
Date: Sat, 13 Apr 2013 01:03:49 +0200
|
|
|
39f05ae |
Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and
|
|
|
39f05ae |
_MACHINE_ID (cherry picked from commit
|
|
|
39f05ae |
d378991747d67fff1d4dc39e7fb2bc8f49f1b561)
|
|
|
39f05ae |
|
|
|
39f05ae |
---
|
|
|
39f05ae |
src/journal/journald-server.c | 4 ++--
|
|
|
39f05ae |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
39f05ae |
|
|
|
39f05ae |
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
|
|
|
39f05ae |
index 53e3830..be84323 100644
|
|
|
39f05ae |
--- a/src/journal/journald-server.c
|
|
|
39f05ae |
+++ b/src/journal/journald-server.c
|
|
|
39f05ae |
@@ -538,7 +538,7 @@ static void dispatch_message_real(
|
|
|
39f05ae |
char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
|
|
|
39f05ae |
uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
|
|
|
39f05ae |
gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
|
|
|
39f05ae |
- source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))],
|
|
|
39f05ae |
+ source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)],
|
|
|
39f05ae |
boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
|
|
|
39f05ae |
machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
|
|
|
39f05ae |
|
|
|
39f05ae |
@@ -699,7 +699,7 @@ static void dispatch_message_real(
|
|
|
39f05ae |
|
|
|
39f05ae |
r = sd_id128_get_machine(&id;;
|
|
|
39f05ae |
if (r >= 0) {
|
|
|
39f05ae |
- sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1);
|
|
|
39f05ae |
+ sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1);
|
|
|
39f05ae |
IOVEC_SET_STRING(iovec[n++], machine_id);
|
|
|
39f05ae |
}
|
|
|
39f05ae |
|