31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
From add74820b72be58f57722000a343ee3b63195eff Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Tue, 14 Mar 2023 22:56:42 +0100
|
||
|
|
Subject: [PATCH] core: fix "(null)" in output
|
||
|
|
|
||
|
|
We want an empty string, not NULL. I made some brainfart here.
|
||
|
|
Fixup for 1980a25dc03aa500d4ee2725d696f68d265cd4ca.
|
||
|
|
|
||
|
|
Conflict:NA
|
||
|
|
Reference:https://github.com/systemd/systemd/commit/add74820b72be58f57722000a343ee3b63195eff
|
||
|
|
---
|
||
|
|
src/core/dbus-manager.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
|
||
|
|
index 242a662bca..6d2ed62f94 100644
|
||
|
|
--- a/src/core/dbus-manager.c
|
||
|
|
+++ b/src/core/dbus-manager.c
|
||
|
|
@@ -1530,7 +1530,7 @@ static void log_caller(sd_bus_message *message, Manager *manager, const char *me
|
||
|
|
log_info("%s requested from client PID " PID_FMT "%s%s%s%s%s%s...",
|
||
|
|
method, pid,
|
||
|
|
comm ? " ('" : "", strempty(comm), comm ? "')" : "",
|
||
|
|
- caller ? " (unit " : "", caller ? caller->id : NULL, caller ? ")" : "");
|
||
|
|
+ caller ? " (unit " : "", caller ? caller->id : "", caller ? ")" : "");
|
||
|
|
}
|
||
|
|
|
||
|
|
static int method_reload(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|