From e65a6e26ad4e57d4532266f3c85f05ce8f190740 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 5 Mar 2026 17:13:15 +0100 Subject: [PATCH] core/varlink-unit: distinguish PIDREF_AUTOMATIC from unset Follow-up for ab73333c43aeec919fadf60b22e5cee7c379cdf2 Methods that take numeric pid values use 0 to denote the peer, hence let's log about 0 on PIDREF_AUTOMATIC, -1 if truly unset. --- src/core/varlink-unit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/varlink-unit.c b/src/core/varlink-unit.c index 95ac16cb85..d222148c77 100644 --- a/src/core/varlink-unit.c +++ b/src/core/varlink-unit.c @@ -408,9 +408,9 @@ static void unit_lookup_parameters_done(UnitLookupParameters *p) { } static int varlink_error_conflict_lookup_parameters(sd_varlink *v, const UnitLookupParameters *p) { - log_debug("Searching unit by lookup parameters name='%s' pid='"PID_FMT"' cgroup='%s' invocationID='%s' resulted in multiple different units", + log_debug("Unit lookup by parameters name='%s' pid='"PID_FMT"' cgroup='%s' invocationID='%s' resulted in multiple different units.", strnull(p->name), - pidref_is_set(&p->pidref) ? p->pidref.pid : 0, + pidref_is_automatic(&p->pidref) ? 0 : pidref_is_set(&p->pidref) ? p->pidref.pid : (pid_t) -1, strnull(p->cgroup), sd_id128_is_null(p->invocation_id) ? "" : SD_ID128_TO_UUID_STRING(p->invocation_id));