From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 27 Jun 2025 14:46:32 +0000 (+0200)
Subject: shared/bus-unit-util: add helper for AppArmorProfile=/SmackProcessLabel=
X-Git-Tag: v258-rc1~183^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=472a1faae8359da533418eaa8229e142ce63e4a8;p=thirdparty%2Fsystemd.git

shared/bus-unit-util: add helper for AppArmorProfile=/SmackProcessLabel=
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index c03c8f375ca..22cdffa020e 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -1304,6 +1304,23 @@ static int bus_append_resource_limit(sd_bus_message *m, const char *field, const
         return 1;
 }
 
+static int bus_append_string_with_ignore(sd_bus_message *m, const char *field, const char *eq) {
+        int ignore = 0;
+        const char *s = eq;
+        int r;
+
+        if (eq[0] == '-') {
+                ignore = 1;
+                s = eq + 1;
+        }
+
+        r = sd_bus_message_append(m, "(sv)", field, "(bs)", ignore, s);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
 static int bus_append_capabilities(sd_bus_message *m, const char *field, const char *eq) {
         uint64_t sum = 0;
         bool invert = false;
@@ -2409,8 +2426,6 @@ static int bus_append_automount_property(sd_bus_message *m, const char *field, c
 }
 
 static int bus_append_execute_property(sd_bus_message *m, const char *field, const char *eq) {
-        int r;
-
         if (STR_IN_SET(field, "User",
                               "Group",
                               "UtmpIdentifier",
@@ -2580,21 +2595,8 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
                 return bus_append_resource_limit(m, field, eq);
 
         if (STR_IN_SET(field, "AppArmorProfile",
-                              "SmackProcessLabel")) {
-                int ignore = 0;
-                const char *s = eq;
-
-                if (eq[0] == '-') {
-                        ignore = 1;
-                        s = eq + 1;
-                }
-
-                r = sd_bus_message_append(m, "(sv)", field, "(bs)", ignore, s);
-                if (r < 0)
-                        return bus_log_create_error(r);
-
-                return 1;
-        }
+                              "SmackProcessLabel"))
+                return bus_append_string_with_ignore(m, field, eq);
 
         if (STR_IN_SET(field, "CapabilityBoundingSet",
                               "AmbientCapabilities"))