chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
991f2a3
)
journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and _MACHINE_ID
author
Mirco Tischler
<mt-ml@gmx.de>
Fri, 12 Apr 2013 23:03:49 +0000
(
01:03
+0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Fri, 12 Apr 2013 23:26:49 +0000
(19:26 -0400)
src/journal/journald-server.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index 53e38301108b140bc286e342c195eab3a97e0837..be84323a6c0623446d68d404688330ed1ec4016c 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-538,7
+538,7
@@
static void dispatch_message_real(
char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
- source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP="
+ DECIMAL_STR_MAX(usec_t)
)],
+ source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP="
) + DECIMAL_STR_MAX(usec_t
)],
boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
@@
-699,7
+699,7
@@
static void dispatch_message_real(
r = sd_id128_get_machine(&id);
if (r >= 0) {
r = sd_id128_get_machine(&id);
if (r >= 0) {
- sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1);
+ sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID
=
") - 1);
IOVEC_SET_STRING(iovec[n++], machine_id);
}
IOVEC_SET_STRING(iovec[n++], machine_id);
}