backport-unit-check-for-correct-function-in-vtable.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

From 891be0c2e7da8d95217e25e91cf1216b46be73fd Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 17 Jan 2024 17:20:29 +0800
Subject: [PATCH] core/unit: check for correct function in vtable

Prompted by https://github.com/systemd/systemd/pull/30974/commits/61e44e01325eca50e88fc9cd400ee340081e9134

(cherry picked from commit 18cf8411b712e7264c56d80369c8945491af90ee)
---
 src/core/unit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/unit.c b/src/core/unit.c
index 41f3bdb226a..2fc9f5ad2d3 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -6605,7 +6605,7 @@ int activation_details_append_pair(ActivationDetails *details, char ***strv) {
                         return r;
         }
 
-        if (ACTIVATION_DETAILS_VTABLE(details)->append_env) {
+        if (ACTIVATION_DETAILS_VTABLE(details)->append_pair) {
                 r = ACTIVATION_DETAILS_VTABLE(details)->append_pair(details, strv);
                 if (r < 0)
                         return r;