|
 |
ff6046 |
From 7e902f1e31bfdd6542343c1656dae3b6853228a6 Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
|
ff6046 |
Date: Fri, 10 Aug 2018 12:45:42 +0000
|
|
|
ff6046 |
Subject: [PATCH] journald: make it clear that dev_kmsg_record modifies the
|
|
|
ff6046 |
string passed to it
|
|
|
ff6046 |
|
|
|
ff6046 |
The function replaces a couple commas, a semicolon and the final newline with
|
|
|
ff6046 |
zero bytes in the string passed to it. The 'const' seems to have been added
|
|
|
ff6046 |
by accident during a bulk edit (more specifically 3b3154df7e2773332bb814).
|
|
|
ff6046 |
|
|
|
ff6046 |
(cherry picked from commit 1e0c5fc2a76e4f3d508331f410899c50493e1fc9)
|
|
|
ff6046 |
|
|
|
ff6046 |
Resolves: #1696224
|
|
|
ff6046 |
---
|
|
|
ff6046 |
src/journal/journald-kmsg.c | 2 +-
|
|
|
ff6046 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
|
|
|
ff6046 |
index e9aff13168..7ad673362a 100644
|
|
|
ff6046 |
--- a/src/journal/journald-kmsg.c
|
|
|
ff6046 |
+++ b/src/journal/journald-kmsg.c
|
|
|
ff6046 |
@@ -93,7 +93,7 @@ static bool is_us(const char *identifier, const char *pid) {
|
|
|
ff6046 |
streq(identifier, program_invocation_short_name);
|
|
|
ff6046 |
}
|
|
|
ff6046 |
|
|
|
ff6046 |
-static void dev_kmsg_record(Server *s, const char *p, size_t l) {
|
|
|
ff6046 |
+static void dev_kmsg_record(Server *s, char *p, size_t l) {
|
|
|
ff6046 |
|
|
|
ff6046 |
_cleanup_free_ char *message = NULL, *syslog_priority = NULL, *syslog_pid = NULL, *syslog_facility = NULL, *syslog_identifier = NULL, *source_time = NULL, *identifier = NULL, *pid = NULL;
|
|
|
ff6046 |
struct iovec iovec[N_IOVEC_META_FIELDS + 7 + N_IOVEC_KERNEL_FIELDS + 2 + N_IOVEC_UDEV_FIELDS];
|