]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - src/shared/bus-unit-util.c
tree-wide: use TAKE_PTR() and TAKE_FD() macros
[thirdparty/systemd.git] / src / shared / bus-unit-util.c
index 8af738d8ce8cebe9ad1c78de372a046270268d29..a9c17d29e2a0a25813539f179f661107a674b254 100644 (file)
@@ -24,6 +24,7 @@
 #include "bus-util.h"
 #include "cap-list.h"
 #include "cgroup-util.h"
+#include "condition.h"
 #include "cpu-set-util.h"
 #include "env-util.h"
 #include "errno-list.h"
 #include "rlimit-util.h"
 #include "securebits-util.h"
 #include "signal-util.h"
+#include "socket-protocol-list.h"
 #include "string-util.h"
 #include "syslog-util.h"
 #include "terminal-util.h"
+#include "unit-def.h"
 #include "user-util.h"
 #include "utf8.h"
 #include "util.h"
@@ -70,6 +73,301 @@ int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
                         &u->job_path);
 }
 
+#define DEFINE_BUS_APPEND_PARSE_PTR(bus_type, cast_type, type, parse_func) \
+        static int bus_append_##parse_func(                             \
+                        sd_bus_message *m,                              \
+                        const char *field,                              \
+                        const char *eq) {                               \
+                type val;                                               \
+                int r;                                                  \
+                                                                        \
+                r = parse_func(eq, &val);                               \
+                if (r < 0)                                              \
+                        return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq); \
+                                                                        \
+                r = sd_bus_message_append(m, "(sv)", field,             \
+                                          bus_type, (cast_type) val);   \
+                if (r < 0)                                              \
+                        return bus_log_create_error(r);                 \
+                                                                        \
+                return 1;                                               \
+        }
+
+#define DEFINE_BUS_APPEND_PARSE(bus_type, parse_func)                   \
+        static int bus_append_##parse_func(                             \
+                        sd_bus_message *m,                              \
+                        const char *field,                              \
+                        const char *eq) {                               \
+                int r;                                                  \
+                                                                        \
+                r = parse_func(eq);                                     \
+                if (r < 0) {                                            \
+                        log_error("Failed to parse %s: %s", field, eq); \
+                        return -EINVAL;                                 \
+                }                                                       \
+                                                                        \
+                r = sd_bus_message_append(m, "(sv)", field,             \
+                                          bus_type, (int32_t) r);       \
+                if (r < 0)                                              \
+                        return bus_log_create_error(r);                 \
+                                                                        \
+                return 1;                                               \
+        }
+
+DEFINE_BUS_APPEND_PARSE("b", parse_boolean);
+DEFINE_BUS_APPEND_PARSE("i", ioprio_class_from_string);
+DEFINE_BUS_APPEND_PARSE("i", ip_tos_from_string);
+DEFINE_BUS_APPEND_PARSE("i", log_facility_unshifted_from_string);
+DEFINE_BUS_APPEND_PARSE("i", log_level_from_string);
+DEFINE_BUS_APPEND_PARSE("i", parse_errno);
+DEFINE_BUS_APPEND_PARSE("i", sched_policy_from_string);
+DEFINE_BUS_APPEND_PARSE("i", secure_bits_from_string);
+DEFINE_BUS_APPEND_PARSE("i", signal_from_string_try_harder);
+DEFINE_BUS_APPEND_PARSE("i", socket_protocol_from_name);
+DEFINE_BUS_APPEND_PARSE_PTR("i", int32_t, int, ioprio_parse_priority);
+DEFINE_BUS_APPEND_PARSE_PTR("i", int32_t, int, parse_nice);
+DEFINE_BUS_APPEND_PARSE_PTR("i", int32_t, int, safe_atoi);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, nsec_t, parse_nsec);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, uint64_t, cg_blkio_weight_parse);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, uint64_t, cg_cpu_shares_parse);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, uint64_t, cg_weight_parse);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, unsigned long, mount_propagation_flags_from_string);
+DEFINE_BUS_APPEND_PARSE_PTR("t", uint64_t, uint64_t, safe_atou64);
+DEFINE_BUS_APPEND_PARSE_PTR("u", uint32_t, mode_t, parse_mode);
+DEFINE_BUS_APPEND_PARSE_PTR("u", uint32_t, unsigned, safe_atou);
+DEFINE_BUS_APPEND_PARSE_PTR("x", int64_t, int64_t, safe_atoi64);
+
+static inline int bus_append_string(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
+
+        r = sd_bus_message_append(m, "(sv)", field, "s", eq);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
+static int bus_append_strv(sd_bus_message *m, const char *field, const char *eq, ExtractFlags flags) {
+        const char *p;
+        int r;
+
+        r = sd_bus_message_open_container(m, 'r', "sv");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_append_basic(m, 's', field);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_open_container(m, 'v', "as");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_open_container(m, 'a', "s");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        for (p = eq;;) {
+                _cleanup_free_ char *word = NULL;
+
+                r = extract_first_word(&p, &word, NULL, flags);
+                if (r == 0)
+                        break;
+                if (r == -ENOMEM)
+                        return log_oom();
+                if (r < 0)
+                        return log_error_errno(r, "Invalid syntax: %s", eq);
+
+                r = sd_bus_message_append_basic(m, 's', word);
+                if (r < 0)
+                        return bus_log_create_error(r);
+        }
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
+static int bus_append_byte_array(sd_bus_message *m, const char *field, const void *buf, size_t n) {
+        int r;
+
+        r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_open_container(m, 'v', "ay");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_append_array(m, 'y', buf, n);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
+static int bus_append_parse_sec_rename(sd_bus_message *m, const char *field, const char *eq) {
+        char *n;
+        usec_t t;
+        size_t l;
+        int r;
+
+        r = parse_sec(eq, &t);
+        if (r < 0)
+                return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq);
+
+        l = strlen(field);
+        n = newa(char, l + 2);
+        /* Change suffix Sec → USec */
+        strcpy(mempcpy(n, field, l - 3), "USec");
+
+        r = sd_bus_message_append(m, "(sv)", n, "t", t);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
+static int bus_append_parse_size(sd_bus_message *m, const char *field, const char *eq, uint64_t base) {
+        uint64_t v;
+        int r;
+
+        r = parse_size(eq, base, &v);
+        if (r < 0)
+                return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq);
+
+        r = sd_bus_message_append(m, "(sv)", field, "t", v);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
+static int bus_append_exec_command(sd_bus_message *m, const char *field, const char *eq) {
+        bool ignore_failure = false, explicit_path = false, done = false;
+        _cleanup_strv_free_ char **l = NULL;
+        _cleanup_free_ char *path = NULL;
+        int r;
+
+        do {
+                switch (*eq) {
+
+                case '-':
+                        if (ignore_failure)
+                                done = true;
+                        else {
+                                ignore_failure = true;
+                                eq++;
+                        }
+                        break;
+
+                case '@':
+                        if (explicit_path)
+                                done = true;
+                        else {
+                                explicit_path = true;
+                                eq++;
+                        }
+                        break;
+
+                case '+':
+                case '!':
+                        /* The bus API doesn't support +, ! and !! currently, unfortunately. :-( */
+                        log_error("Sorry, but +, ! and !! are currently not supported for transient services.");
+                        return -EOPNOTSUPP;
+
+                default:
+                        done = true;
+                        break;
+                }
+        } while (!done);
+
+        if (explicit_path) {
+                r = extract_first_word(&eq, &path, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to parse path: %m");
+        }
+
+        r = strv_split_extract(&l, eq, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
+        if (r < 0)
+                return log_error_errno(r, "Failed to parse command line: %m");
+
+        r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_open_container(m, 'v', "a(sasb)");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_open_container(m, 'a', "(sasb)");
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        if (!strv_isempty(l)) {
+
+                r = sd_bus_message_open_container(m, 'r', "sasb");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append(m, "s", path ?: l[0]);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append_strv(m, l);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append(m, "b", ignore_failure);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
+        }
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
 static int bus_append_ip_address_access(sd_bus_message *m, int family, const union in_addr_union *prefix, unsigned char prefixlen) {
         int r;
 
@@ -95,31 +393,79 @@ static int bus_append_ip_address_access(sd_bus_message *m, int family, const uni
         return sd_bus_message_close_container(m);
 }
 
-int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignment) {
-        const char *eq, *field;
-        UnitDependency dep;
-        int r, rl;
+static int bus_append_cgroup_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
 
-        assert(m);
-        assert(assignment);
+        if (STR_IN_SET(field, "DevicePolicy", "Slice"))
 
-        eq = strchr(assignment, '=');
-        if (!eq) {
-                log_error("Not an assignment: %s", assignment);
-                return -EINVAL;
+                return bus_append_string(m, field, eq);
+
+        if (STR_IN_SET(field,
+                       "CPUAccounting", "MemoryAccounting", "IOAccounting", "BlockIOAccounting",
+                       "TasksAccounting", "IPAccounting"))
+
+                return bus_append_parse_boolean(m, field, eq);
+
+        if (STR_IN_SET(field, "CPUWeight", "StartupCPUWeight", "IOWeight", "StartupIOWeight"))
+
+                return bus_append_cg_weight_parse(m, field, eq);
+
+        if (STR_IN_SET(field, "CPUShares", "StartupCPUShares"))
+
+                return bus_append_cg_cpu_shares_parse(m, field, eq);
+
+        if (STR_IN_SET(field, "BlockIOWeight", "StartupBlockIOWeight"))
+
+                return bus_append_cg_blkio_weight_parse(m, field, eq);
+
+        if (streq(field, "Delegate")) {
+
+                r = parse_boolean(eq);
+                if (r < 0)
+                        return bus_append_strv(m, "DelegateControllers", eq, EXTRACT_QUOTES);
+
+                r = sd_bus_message_append(m, "(sv)", "Delegate", "b", r);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
         }
 
-        r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
-        if (r < 0)
-                return bus_log_create_error(r);
+        if (STR_IN_SET(field, "MemoryLow", "MemoryHigh", "MemoryMax", "MemorySwapMax", "MemoryLimit", "TasksMax")) {
 
-        field = strndupa(assignment, eq - assignment);
-        eq++;
+                if (isempty(eq) || streq(eq, "infinity")) {
+                        r = sd_bus_message_append(m, "(sv)", field, "t", CGROUP_LIMIT_MAX);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+                        return 1;
+                }
+
+                r = parse_percent(eq);
+                if (r >= 0) {
+                        char *n;
+
+                        /* When this is a percentage we'll convert this into a relative value in the range
+                         * 0…UINT32_MAX and pass it in the MemoryLowScale property (and related
+                         * ones). This way the physical memory size can be determined server-side */
+
+                        n = strjoina(field, "Scale");
+                        r = sd_bus_message_append(m, "(sv)", n, "u", (uint32_t) (((uint64_t) UINT32_MAX * r) / 100U));
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        return 1;
+                }
+
+                if (streq(field, "TasksMax"))
+                        return bus_append_safe_atou64(m, field, eq);
+
+                return bus_append_parse_size(m, field, eq, 1024);
+        }
 
         if (streq(field, "CPUQuota")) {
 
                 if (isempty(eq))
-                        r = sd_bus_message_append(m, "sv", "CPUQuotaPerSecUSec", "t", USEC_INFINITY);
+                        r = sd_bus_message_append(m, "(sv)", "CPUQuotaPerSecUSec", "t", USEC_INFINITY);
                 else {
                         r = parse_percent_unbounded(eq);
                         if (r <= 0) {
@@ -127,215 +473,346 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                                 return -EINVAL;
                         }
 
-                        r = sd_bus_message_append(m, "sv", "CPUQuotaPerSecUSec", "t", (usec_t) r * USEC_PER_SEC / 100U);
+                        r = sd_bus_message_append(m, "(sv)", "CPUQuotaPerSecUSec", "t", (usec_t) r * USEC_PER_SEC / 100U);
                 }
 
-                goto finish;
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
+        }
 
-        } else if (streq(field, "EnvironmentFile")) {
+        if (streq(field, "DeviceAllow")) {
 
                 if (isempty(eq))
-                        r = sd_bus_message_append(m, "sv", "EnvironmentFiles", "a(sb)", 0);
-                else
-                        r = sd_bus_message_append(m, "sv", "EnvironmentFiles", "a(sb)", 1,
-                                                  eq[0] == '-' ? eq + 1 : eq,
-                                                  eq[0] == '-');
-                goto finish;
+                        r = sd_bus_message_append(m, "(sv)", field, "a(ss)", 0);
+                else {
+                        const char *path = eq, *rwm = NULL, *e;
+
+                        e = strchr(eq, ' ');
+                        if (e) {
+                                path = strndupa(eq, e - eq);
+                                rwm = e+1;
+                        }
+
+                        r = sd_bus_message_append(m, "(sv)", field, "a(ss)", 1, path, strempty(rwm));
+                }
+
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
+        }
+
+        if (cgroup_io_limit_type_from_string(field) >= 0 || STR_IN_SET(field, "BlockIOReadBandwidth", "BlockIOWriteBandwidth")) {
+
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", field, "a(st)", 0);
+                else {
+                        const char *path, *bandwidth, *e;
+                        uint64_t bytes;
+
+                        e = strchr(eq, ' ');
+                        if (!e) {
+                                log_error("Failed to parse %s value %s.", field, eq);
+                                return -EINVAL;
+                        }
+
+                        path = strndupa(eq, e - eq);
+                        bandwidth = e+1;
+
+                        if (streq(bandwidth, "infinity")) {
+                                bytes = CGROUP_LIMIT_MAX;
+                        } else {
+                                r = parse_size(bandwidth, 1000, &bytes);
+                                if (r < 0)
+                                        return log_error_errno(r, "Failed to parse byte value %s: %m", bandwidth);
+                        }
+
+                        r = sd_bus_message_append(m, "(sv)", field, "a(st)", 1, path, bytes);
+                }
+
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
+        }
+
+        if (STR_IN_SET(field, "IODeviceWeight", "BlockIODeviceWeight")) {
+
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", field, "a(st)", 0);
+                else {
+                        const char *path, *weight, *e;
+                        uint64_t u;
+
+                        e = strchr(eq, ' ');
+                        if (!e) {
+                                log_error("Failed to parse %s value %s.", field, eq);
+                                return -EINVAL;
+                        }
+
+                        path = strndupa(eq, e - eq);
+                        weight = e+1;
+
+                        r = safe_atou64(weight, &u);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse %s value %s: %m", field, weight);
+
+                        r = sd_bus_message_append(m, "(sv)", field, "a(st)", 1, path, u);
+                }
+
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
+        }
+
+        if (STR_IN_SET(field, "IPAddressAllow", "IPAddressDeny")) {
+                unsigned char prefixlen;
+                union in_addr_union prefix = {};
+                int family;
+
+                if (isempty(eq)) {
+                        r = sd_bus_message_append(m, "(sv)", field, "a(iayu)", 0);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        return 1;
+                }
+
+                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_open_container(m, 'v', "a(iayu)");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_open_container(m, 'a', "(iayu)");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                if (streq(eq, "any")) {
+                        /* "any" is a shortcut for 0.0.0.0/0 and ::/0 */
+
+                        r = bus_append_ip_address_access(m, AF_INET, &prefix, 0);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        r = bus_append_ip_address_access(m, AF_INET6, &prefix, 0);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                } else if (is_localhost(eq)) {
+                        /* "localhost" is a shortcut for 127.0.0.0/8 and ::1/128 */
+
+                        prefix.in.s_addr = htobe32(0x7f000000);
+                        r = bus_append_ip_address_access(m, AF_INET, &prefix, 8);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        prefix.in6 = (struct in6_addr) IN6ADDR_LOOPBACK_INIT;
+                        r = bus_append_ip_address_access(m, AF_INET6, &prefix, 128);
+                        if (r < 0)
+                                return r;
+
+                } else if (streq(eq, "link-local")) {
+                        /* "link-local" is a shortcut for 169.254.0.0/16 and fe80::/64 */
+
+                        prefix.in.s_addr = htobe32((UINT32_C(169) << 24 | UINT32_C(254) << 16));
+                        r = bus_append_ip_address_access(m, AF_INET, &prefix, 16);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                        prefix.in6 = (struct in6_addr) {
+                                .s6_addr32[0] = htobe32(0xfe800000)
+                        };
+                        r = bus_append_ip_address_access(m, AF_INET6, &prefix, 64);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                } else if (streq(eq, "multicast")) {
+                        /* "multicast" is a shortcut for 224.0.0.0/4 and ff00::/8 */
 
-        } else if (STR_IN_SET(field, "AccuracySec", "RandomizedDelaySec", "RuntimeMaxSec")) {
-                char *n;
-                usec_t t;
-                size_t l;
+                        prefix.in.s_addr = htobe32((UINT32_C(224) << 24));
+                        r = bus_append_ip_address_access(m, AF_INET, &prefix, 4);
+                        if (r < 0)
+                                return bus_log_create_error(r);
 
-                r = parse_sec(eq, &t);
+                        prefix.in6 = (struct in6_addr) {
+                                .s6_addr32[0] = htobe32(0xff000000)
+                        };
+                        r = bus_append_ip_address_access(m, AF_INET6, &prefix, 8);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+
+                } else {
+                        r = in_addr_prefix_from_string_auto(eq, &family, &prefix, &prefixlen);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse IP address prefix: %s", eq);
+
+                        r = bus_append_ip_address_access(m, family, &prefix, prefixlen);
+                        if (r < 0)
+                                return bus_log_create_error(r);
+                }
+
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s= parameter: %s", field, eq);
+                        return bus_log_create_error(r);
 
-                l = strlen(field);
-                n = newa(char, l + 2);
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+static int bus_append_automount_property(sd_bus_message *m, const char *field, const char *eq) {
+
+        if (streq(field, "Where"))
+
+                return bus_append_string(m, field, eq);
+
+        if (streq(field, "DirectoryMode"))
+
+                return bus_append_parse_mode(m, field, eq);
+
+        if (streq(field, "TimeoutIdleSec"))
+
+                return bus_append_parse_sec_rename(m, field, eq);
+
+        return 0;
+}
 
-                /* Change suffix Sec → USec */
-                strcpy(mempcpy(n, field, l - 3), "USec");
-                r = sd_bus_message_append(m, "sv", n, "t", t);
-                goto finish;
+static int bus_append_execute_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r, rl;
 
-        } else if (streq(field, "LogExtraFields")) {
+        if (STR_IN_SET(field,
+                       "User", "Group",
+                       "UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath",
+                       "WorkingDirectory", "RootDirectory", "SyslogIdentifier",
+                       "ProtectSystem", "ProtectHome", "SELinuxContext", "RootImage",
+                       "RuntimeDirectoryPreserve", "Personality", "KeyringMode"))
 
-                r = sd_bus_message_append(m, "s", "LogExtraFields");
-                if (r < 0)
-                        goto finish;
+                return bus_append_string(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'v', "aay");
-                if (r < 0)
-                        goto finish;
+        if (STR_IN_SET(field,
+                       "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "TTYVTDisallocate",
+                       "PrivateTmp", "PrivateDevices", "PrivateNetwork", "PrivateUsers",
+                       "NoNewPrivileges", "SyslogLevelPrefix",
+                       "MemoryDenyWriteExecute", "RestrictRealtime", "DynamicUser", "RemoveIPC",
+                       "ProtectKernelTunables", "ProtectKernelModules", "ProtectControlGroups",
+                       "MountAPIVFS", "CPUSchedulingResetOnFork", "LockPersonality"))
 
-                r = sd_bus_message_open_container(m, 'a', "ay");
-                if (r < 0)
-                        goto finish;
+                return bus_append_parse_boolean(m, field, eq);
 
-                r = sd_bus_message_append_array(m, 'y', eq, strlen(eq));
-                if (r < 0)
-                        goto finish;
+        if (STR_IN_SET(field,
+                       "ReadWriteDirectories", "ReadOnlyDirectories", "InaccessibleDirectories",
+                       "ReadWritePaths", "ReadOnlyPaths", "InaccessiblePaths",
+                       "RuntimeDirectory", "StateDirectory", "CacheDirectory", "LogsDirectory", "ConfigurationDirectory",
+                       "SupplementaryGroups", "SystemCallArchitectures"))
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
-                        goto finish;
+                return bus_append_strv(m, field, eq, EXTRACT_QUOTES);
 
-                r = sd_bus_message_close_container(m);
-                goto finish;
+        if (STR_IN_SET(field, "SyslogLevel", "LogLevelMax"))
 
-        } else if (STR_IN_SET(field, "MemoryLow", "MemoryHigh", "MemoryMax", "MemorySwapMax", "MemoryLimit")) {
-                uint64_t bytes;
+                return bus_append_log_level_from_string(m, field, eq);
 
-                if (isempty(eq) || streq(eq, "infinity"))
-                        bytes = CGROUP_LIMIT_MAX;
-                else {
-                        r = parse_percent(eq);
-                        if (r >= 0) {
-                                char *n;
+        if (streq(field, "SyslogFacility"))
 
-                                /* When this is a percentage we'll convert this into a relative value in the range
-                                 * 0…UINT32_MAX and pass it in the MemoryLowScale property (and related
-                                 * ones). This way the physical memory size can be determined server-side */
+                return bus_append_log_facility_unshifted_from_string(m, field, eq);
 
-                                n = strjoina(field, "Scale");
-                                r = sd_bus_message_append(m, "sv", n, "u", (uint32_t) (((uint64_t) UINT32_MAX * r) / 100U));
-                                goto finish;
+        if (streq(field, "SecureBits"))
 
-                        } else {
-                                r = parse_size(eq, 1024, &bytes);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to parse bytes specification %s", assignment);
-                        }
-                }
+                return bus_append_secure_bits_from_string(m, field, eq);
 
-                r = sd_bus_message_append(m, "sv", field, "t", bytes);
-                goto finish;
+        if (streq(field, "CPUSchedulingPolicy"))
 
-        } else if (streq(field, "Delegate")) {
+                return bus_append_sched_policy_from_string(m, field, eq);
 
-                r = parse_boolean(eq);
-                if (r < 0) {
-                        const char *p = eq;
+        if (STR_IN_SET(field, "CPUSchedulingPriority", "OOMScoreAdjust"))
 
-                        r = sd_bus_message_append(m, "s", "DelegateControllers");
-                        if (r < 0)
-                                goto finish;
+                return bus_append_safe_atoi(m, field, eq);
 
-                        r = sd_bus_message_open_container(m, 'v', "as");
-                        if (r < 0)
-                                goto finish;
+        if (streq(field, "Nice"))
 
-                        r = sd_bus_message_open_container(m, 'a', "s");
-                        if (r < 0)
-                                goto finish;
+                return bus_append_parse_nice(m, field, eq);
 
-                        for (;;) {
-                                _cleanup_free_ char *word = NULL;
+        if (streq(field, "SystemCallErrorNumber"))
 
-                                r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                                if (r == 0)
-                                        break;
-                                if (r == -ENOMEM)
-                                        return log_oom();
-                                if (r < 0)
-                                        return log_error_errno(r, "Invalid syntax: %s", eq);
+                return bus_append_parse_errno(m, field, eq);
 
-                                r = sd_bus_message_append(m, "s", word);
-                                if (r < 0)
-                                        goto finish;
-                        }
+        if (streq(field, "IOSchedulingClass"))
 
-                        r = sd_bus_message_close_container(m);
-                        if (r < 0)
-                                goto finish;
+                return bus_append_ioprio_class_from_string(m, field, eq);
 
-                        r = sd_bus_message_close_container(m);
-                } else
-                        r = sd_bus_message_append(m, "sv", "Delegate", "b", r);
+        if (streq(field, "IOSchedulingPriority"))
 
-                goto finish;
+                return bus_append_ioprio_parse_priority(m, field, eq);
 
-        } else if (streq(field, "TasksMax")) {
-                uint64_t t;
+        if (STR_IN_SET(field,
+                       "RuntimeDirectoryMode", "StateDirectoryMode", "CacheDirectoryMode",
+                       "LogsDirectoryMode", "ConfigurationDirectoryMode", "UMask"))
 
-                if (isempty(eq) || streq(eq, "infinity"))
-                        t = (uint64_t) -1;
-                else {
-                        r = parse_percent(eq);
-                        if (r >= 0) {
-                                r = sd_bus_message_append(m, "sv", "TasksMaxScale", "u", (uint32_t) (((uint64_t) UINT32_MAX * r) / 100U));
-                                goto finish;
-                        } else {
-                                r = safe_atou64(eq, &t);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to parse maximum tasks specification %s", assignment);
-                        }
+                return bus_append_parse_mode(m, field, eq);
 
-                }
+        if (streq(field, "TimerSlackNSec"))
 
-                r = sd_bus_message_append(m, "sv", "TasksMax", "t", t);
-                goto finish;
+                return bus_append_parse_nsec(m, field, eq);
 
-        } else if (STR_IN_SET(field, "StandardInput", "StandardOutput", "StandardError")) {
-                const char *n, *appended;
+        if (streq(field, "MountFlags"))
 
-                n = startswith(eq, "fd:");
-                if (n) {
-                        appended = strjoina(field, "FileDescriptorName");
-                        r = sd_bus_message_append(m, "sv", appended, "s", n);
+                return bus_append_mount_propagation_flags_from_string(m, field, eq);
 
-                } else if ((n = startswith(eq, "file:"))) {
-                        appended = strjoina(field, "File");
-                        r = sd_bus_message_append(m, "sv", appended, "s", n);
-                } else
-                        r = sd_bus_message_append(m, "sv", field, "s", eq);
+        if (STR_IN_SET(field, "Environment", "UnsetEnvironment", "PassEnvironment"))
 
-                goto finish;
+                return bus_append_strv(m, field, eq, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
 
-        } else if (streq(field, "StandardInputText")) {
-                _cleanup_free_ char *unescaped = NULL;
+        if (streq(field, "EnvironmentFile")) {
 
-                r = cunescape(eq, 0, &unescaped);
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 0);
+                else
+                        r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 1,
+                                                  eq[0] == '-' ? eq + 1 : eq,
+                                                  eq[0] == '-');
                 if (r < 0)
-                        return log_error_errno(r, "Failed to unescape text '%s': %m", eq);
+                        return bus_log_create_error(r);
 
-                if (!strextend(&unescaped, "\n", NULL))
-                        return log_oom();
+                return 1;
+        }
 
-                /* Note that we don't expand specifiers here, but that should be OK, as this is a programmatic
-                 * interface anyway */
+        if (streq(field, "LogExtraFields")) {
 
-                r = sd_bus_message_append(m, "s", "StandardInputData");
+                r = sd_bus_message_open_container(m, 'r', "sv");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'v', "ay");
+                r = sd_bus_message_append_basic(m, 's', "LogExtraFields");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_append_array(m, 'y', unescaped, strlen(unescaped));
+                r = sd_bus_message_open_container(m, 'v', "aay");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
-                goto finish;
-        }
-
-        r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
-        if (r < 0)
-                return bus_log_create_error(r);
-
-        rl = rlimit_from_string(field);
-        if (rl >= 0) {
-                const char *sn;
-                struct rlimit l;
-
-                r = rlimit_parse(rl, eq, &l);
+                r = sd_bus_message_open_container(m, 'a', "ay");
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse resource limit: %s", eq);
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_append(m, "v", "t", l.rlim_max);
+                r = sd_bus_message_append_array(m, 'y', eq, strlen(eq));
                 if (r < 0)
                         return bus_log_create_error(r);
 
@@ -343,78 +820,52 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                sn = strjoina(field, "Soft");
-                r = sd_bus_message_append(m, "sv", sn, "t", l.rlim_cur);
-
-        } else if (STR_IN_SET(field,
-                              "CPUAccounting", "MemoryAccounting", "IOAccounting", "BlockIOAccounting",
-                              "TasksAccounting", "IPAccounting", "SendSIGHUP", "SendSIGKILL", "WakeSystem",
-                              "DefaultDependencies", "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "TTYVTDisallocate",
-                              "RemainAfterExit", "PrivateTmp", "PrivateDevices", "PrivateNetwork", "PrivateUsers",
-                              "NoNewPrivileges", "SyslogLevelPrefix", "RemainAfterElapse", "Persistent",
-                              "MemoryDenyWriteExecute", "RestrictRealtime", "DynamicUser", "RemoveIPC",
-                              "ProtectKernelTunables", "ProtectKernelModules", "ProtectControlGroups", "MountAPIVFS",
-                              "CPUSchedulingResetOnFork", "LockPersonality", "MakeDirectory")) {
-
-                r = parse_boolean(eq);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse boolean assignment %s.", assignment);
-
-                r = sd_bus_message_append(m, "v", "b", r);
-
-        } else if (STR_IN_SET(field, "CPUWeight", "StartupCPUWeight")) {
-                uint64_t u;
-
-                r = cg_weight_parse(eq, &u);
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
-
-                r = sd_bus_message_append(m, "v", "t", u);
-
-        } else if (STR_IN_SET(field, "CPUShares", "StartupCPUShares")) {
-                uint64_t u;
+                        return bus_log_create_error(r);
 
-                r = cg_cpu_shares_parse(eq, &u);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                return 1;
+        }
 
-                r = sd_bus_message_append(m, "v", "t", u);
+        if (STR_IN_SET(field, "StandardInput", "StandardOutput", "StandardError")) {
+                const char *n, *appended;
 
-        } else if (STR_IN_SET(field, "IOWeight", "StartupIOWeight")) {
-                uint64_t u;
+                if ((n = startswith(eq, "fd:"))) {
+                        appended = strjoina(field, "FileDescriptorName");
+                        r = sd_bus_message_append(m, "(sv)", appended, "s", n);
+                } else if ((n = startswith(eq, "file:"))) {
+                        appended = strjoina(field, "File");
+                        r = sd_bus_message_append(m, "(sv)", appended, "s", n);
+                } else
+                        r = sd_bus_message_append(m, "(sv)", field, "s", eq);
 
-                r = cg_weight_parse(eq, &u);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_append(m, "v", "t", u);
+                return 1;
+        }
 
-        } else if (STR_IN_SET(field, "BlockIOWeight", "StartupBlockIOWeight")) {
-                uint64_t u;
+        if (streq(field, "StandardInputText")) {
+                _cleanup_free_ char *unescaped = NULL;
 
-                r = cg_blkio_weight_parse(eq, &u);
+                r = cunescape(eq, 0, &unescaped);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                        return log_error_errno(r, "Failed to unescape text '%s': %m", eq);
 
-                r = sd_bus_message_append(m, "v", "t", u);
+                if (!strextend(&unescaped, "\n", NULL))
+                        return log_oom();
 
-        } else if (STR_IN_SET(field,
-                              "User", "Group", "DevicePolicy", "KillMode",
-                              "UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath",
-                              "Description", "Slice", "Type", "WorkingDirectory",
-                              "RootDirectory", "SyslogIdentifier", "ProtectSystem",
-                              "ProtectHome", "SELinuxContext", "Restart", "RootImage",
-                              "NotifyAccess", "RuntimeDirectoryPreserve", "Personality",
-                              "KeyringMode", "CollectMode", "FailureAction", "SuccessAction",
-                              "OnCalendar"))
+                /* Note that we don't expand specifiers here, but that should be OK, as this is a programmatic
+                 * interface anyway */
 
-                r = sd_bus_message_append(m, "v", "s", eq);
+                return bus_append_byte_array(m, field, unescaped, strlen(unescaped));
+        }
 
-        else if (streq(field, "StandardInputData")) {
+        if (streq(field, "StandardInputData")) {
                 _cleanup_free_ void *decoded = NULL;
                 size_t sz;
 
@@ -422,66 +873,51 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                 if (r < 0)
                         return log_error_errno(r, "Failed to decode base64 data '%s': %m", eq);
 
-                r = sd_bus_message_open_container(m, 'v', "ay");
+                return bus_append_byte_array(m, field, decoded, sz);
+        }
+
+        rl = rlimit_from_string(field);
+        if (rl >= 0) {
+                const char *sn;
+                struct rlimit l;
+
+                r = rlimit_parse(rl, eq, &l);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to parse resource limit: %s", eq);
+
+                r = sd_bus_message_append(m, "(sv)", field, "t", l.rlim_max);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_append_array(m, 'y', decoded, sz);
+                sn = strjoina(field, "Soft");
+                r = sd_bus_message_append(m, "(sv)", sn, "t", l.rlim_cur);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
+                return 1;
+        }
 
-        } else if (STR_IN_SET(field, "AppArmorProfile", "SmackProcessLabel")) {
-                bool ignore;
-                const char *s;
+        if (STR_IN_SET(field, "AppArmorProfile", "SmackProcessLabel")) {
+                int ignore = 0;
+                const char *s = eq;
 
                 if (eq[0] == '-') {
-                        ignore = true;
+                        ignore = 1;
                         s = eq + 1;
-                } else {
-                        ignore = false;
-                        s = eq;
-                }
-
-                r = sd_bus_message_append(m, "v", "(bs)", ignore, s);
-
-        } else if (STR_IN_SET(field, "SyslogLevel", "LogLevelMax")) {
-                int level;
-
-                level = log_level_from_string(eq);
-                if (level < 0) {
-                        log_error("Failed to parse %s value %s.", field, eq);
-                        return -EINVAL;
-                }
-
-                r = sd_bus_message_append(m, "v", "i", level);
-
-        } else if (streq(field, "SyslogFacility")) {
-                int facility;
-
-                facility = log_facility_unshifted_from_string(eq);
-                if (facility < 0) {
-                        log_error("Failed to parse %s value %s.", field, eq);
-                        return -EINVAL;
                 }
 
-                r = sd_bus_message_append(m, "v", "i", facility);
-
-        } else if (streq(field, "SecureBits")) {
-
-                r = secure_bits_from_string(eq);
+                r = sd_bus_message_append(m, "(sv)", field, "(bs)", ignore, s);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_append(m, "v", "i", r);
+                return 1;
+        }
 
-        } else if (STR_IN_SET(field, "CapabilityBoundingSet", "AmbientCapabilities")) {
+        if (STR_IN_SET(field, "CapabilityBoundingSet", "AmbientCapabilities")) {
                 uint64_t sum = 0;
                 bool invert = false;
-                const char *p;
+                const char *p = eq;
 
-                p = eq;
                 if (*p == '~') {
                         invert = true;
                         p++;
@@ -493,310 +929,246 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
 
                 sum = invert ? ~sum : sum;
 
-                r = sd_bus_message_append(m, "v", "t", sum);
-
-        } else if (streq(field, "DeviceAllow")) {
-
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "v", "a(ss)", 0);
-                else {
-                        const char *path, *rwm, *e;
-
-                        e = strchr(eq, ' ');
-                        if (e) {
-                                path = strndupa(eq, e - eq);
-                                rwm = e+1;
-                        } else {
-                                path = eq;
-                                rwm = "";
-                        }
-
-                        if (!is_deviceallow_pattern(path)) {
-                                log_error("%s is not a device file in /dev.", path);
-                                return -EINVAL;
-                        }
-
-                        r = sd_bus_message_append(m, "v", "a(ss)", 1, path, rwm);
-                }
+                r = sd_bus_message_append(m, "(sv)", field, "t", sum);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-        } else if (cgroup_io_limit_type_from_string(field) >= 0 || STR_IN_SET(field, "BlockIOReadBandwidth", "BlockIOWriteBandwidth")) {
+                return 1;
+        }
 
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "v", "a(st)", 0);
-                else {
-                        const char *path, *bandwidth, *e;
-                        uint64_t bytes;
+        if (streq(field, "CPUAffinity")) {
+                _cleanup_cpu_free_ cpu_set_t *cpuset = NULL;
 
-                        e = strchr(eq, ' ');
-                        if (e) {
-                                path = strndupa(eq, e - eq);
-                                bandwidth = e+1;
-                        } else {
-                                log_error("Failed to parse %s value %s.", field, eq);
-                                return -EINVAL;
-                        }
+                r = parse_cpu_set(eq, &cpuset);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
 
-                        if (!path_startswith(path, "/dev")) {
-                                log_error("%s is not a device file in /dev.", path);
-                                return -EINVAL;
-                        }
+                return bus_append_byte_array(m, field, cpuset, CPU_ALLOC_SIZE(r));
+        }
 
-                        if (streq(bandwidth, "infinity")) {
-                                bytes = CGROUP_LIMIT_MAX;
-                        } else {
-                                r = parse_size(bandwidth, 1000, &bytes);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to parse byte value %s: %m", bandwidth);
-                        }
+        if (STR_IN_SET(field, "RestrictAddressFamilies", "SystemCallFilter")) {
+                int whitelist = 1;
+                const char *p = eq;
 
-                        r = sd_bus_message_append(m, "v", "a(st)", 1, path, bytes);
+                if (*p == '~') {
+                        whitelist = 0;
+                        p++;
                 }
 
-        } else if (STR_IN_SET(field, "IODeviceWeight", "BlockIODeviceWeight")) {
-
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "v", "a(st)", 0);
-                else {
-                        const char *path, *weight, *e;
-                        uint64_t u;
+                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        e = strchr(eq, ' ');
-                        if (e) {
-                                path = strndupa(eq, e - eq);
-                                weight = e+1;
-                        } else {
-                                log_error("Failed to parse %s value %s.", field, eq);
-                                return -EINVAL;
-                        }
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        if (!path_startswith(path, "/dev")) {
-                                log_error("%s is not a device file in /dev.", path);
-                                return -EINVAL;
-                        }
+                r = sd_bus_message_open_container(m, 'v', "(bas)");
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        r = safe_atou64(weight, &u);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value %s: %m", field, weight);
+                r = sd_bus_message_open_container(m, 'r', "bas");
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        r = sd_bus_message_append(m, "v", "a(st)", 1, path, u);
-                }
+                r = sd_bus_message_append_basic(m, 'b', &whitelist);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-        } else if (STR_IN_SET(field, "IPAddressAllow", "IPAddressDeny")) {
+                r = sd_bus_message_open_container(m, 'a', "s");
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "v", "a(iayu)", 0);
-                else {
-                        unsigned char prefixlen;
-                        union in_addr_union prefix = {};
-                        int family;
+                for (p = eq;;) {
+                        _cleanup_free_ char *word = NULL;
 
-                        r = sd_bus_message_open_container(m, 'v', "a(iayu)");
+                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
+                        if (r == 0)
+                                break;
+                        if (r == -ENOMEM)
+                                return log_oom();
                         if (r < 0)
-                                return bus_log_create_error(r);
+                                return log_error_errno(r, "Invalid syntax: %s", eq);
 
-                        r = sd_bus_message_open_container(m, 'a', "(iayu)");
+                        r = sd_bus_message_append_basic(m, 's', word);
                         if (r < 0)
-                                return bus_log_create_error(r);
-
-                        if (streq(eq, "any")) {
-                                /* "any" is a shortcut for 0.0.0.0/0 and ::/0 */
-
-                                r = bus_append_ip_address_access(m, AF_INET, &prefix, 0);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-
-                                r = bus_append_ip_address_access(m, AF_INET6, &prefix, 0);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-
-                        } else if (is_localhost(eq)) {
-                                /* "localhost" is a shortcut for 127.0.0.0/8 and ::1/128 */
-
-                                prefix.in.s_addr = htobe32(0x7f000000);
-                                r = bus_append_ip_address_access(m, AF_INET, &prefix, 8);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-
-                                prefix.in6 = (struct in6_addr) IN6ADDR_LOOPBACK_INIT;
-                                r = bus_append_ip_address_access(m, AF_INET6, &prefix, 128);
-                                if (r < 0)
-                                        return r;
-
-                        } else if (streq(eq, "link-local")) {
-
-                                /* "link-local" is a shortcut for 169.254.0.0/16 and fe80::/64 */
-
-                                prefix.in.s_addr = htobe32((UINT32_C(169) << 24 | UINT32_C(254) << 16));
-                                r = bus_append_ip_address_access(m, AF_INET, &prefix, 16);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-
-                                prefix.in6 = (struct in6_addr) {
-                                        .s6_addr32[0] = htobe32(0xfe800000)
-                                };
-                                r = bus_append_ip_address_access(m, AF_INET6, &prefix, 64);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
+                                return bus_log_create_error(r);
+                }
 
-                        } else if (streq(eq, "multicast")) {
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                                /* "multicast" is a shortcut for 224.0.0.0/4 and ff00::/8 */
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                                prefix.in.s_addr = htobe32((UINT32_C(224) << 24));
-                                r = bus_append_ip_address_access(m, AF_INET, &prefix, 4);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                                prefix.in6 = (struct in6_addr) {
-                                        .s6_addr32[0] = htobe32(0xff000000)
-                                };
-                                r = bus_append_ip_address_access(m, AF_INET6, &prefix, 8);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        } else {
-                                r = in_addr_prefix_from_string_auto(eq, &family, &prefix, &prefixlen);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to parse IP address prefix: %s", eq);
+                return 1;
+        }
 
-                                r = bus_append_ip_address_access(m, family, &prefix, prefixlen);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-                        }
+        if (streq(field, "RestrictNamespaces")) {
+                bool invert = false;
+                unsigned long flags = 0;
 
-                        r = sd_bus_message_close_container(m);
-                        if (r < 0)
-                                return bus_log_create_error(r);
+                if (eq[0] == '~') {
+                        invert = true;
+                        eq++;
+                }
 
-                        r = sd_bus_message_close_container(m);
+                r = parse_boolean(eq);
+                if (r > 0)
+                        flags = 0;
+                else if (r == 0)
+                        flags = NAMESPACE_FLAGS_ALL;
+                else {
+                        r = namespace_flag_from_string_many(eq, &flags);
                         if (r < 0)
-                                return bus_log_create_error(r);
+                                return log_error_errno(r, "Failed to parse %s value %s.", field, eq);
                 }
 
-        } else if (streq(field, "CPUSchedulingPolicy")) {
-                int n;
+                if (invert)
+                        flags = (~flags) & NAMESPACE_FLAGS_ALL;
 
-                n = sched_policy_from_string(eq);
-                if (n < 0)
-                        return log_error_errno(r, "Failed to parse CPUSchedulingPolicy: %s", eq);
+                r = sd_bus_message_append(m, "(sv)", field, "t", (uint64_t) flags);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_append(m, "v", "i", (int32_t) n);
+                return 1;
+        }
 
-        } else if (streq(field, "CPUSchedulingPriority")) {
-                int n;
+        if (STR_IN_SET(field, "BindPaths", "BindReadOnlyPaths")) {
+                const char *p = eq;
 
-                r = safe_atoi(eq, &n);
+                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
                 if (r < 0)
-                        return log_error_errno(r, "Failed to parse CPUSchedulingPriority: %s", eq);
-                if (!sched_priority_is_valid(n))
-                        return log_error_errno(r, "Invalid CPUSchedulingPriority: %s", eq);
-
-                r = sd_bus_message_append(m, "v", "i", (int32_t) n);
-
-        } else if (streq(field, "CPUAffinity")) {
-                _cleanup_cpu_free_ cpu_set_t *cpuset = NULL;
-                int ncpus;
+                        return bus_log_create_error(r);
 
-                ncpus = parse_cpu_set(eq, &cpuset);
-                if (ncpus < 0)
-                        return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'v', "ay");
+                r = sd_bus_message_open_container(m, 'v', "a(ssbt)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_append_array(m, 'y', cpuset, CPU_ALLOC_SIZE(ncpus));
+                r = sd_bus_message_open_container(m, 'a', "(ssbt)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
+                for (;;) {
+                        _cleanup_free_ char *source = NULL, *destination = NULL;
+                        char *s = NULL, *d = NULL;
+                        bool ignore_enoent = false;
+                        uint64_t flags = MS_REC;
 
-        } else if (streq(field, "Nice")) {
-                int n;
+                        r = extract_first_word(&p, &source, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse argument: %m");
+                        if (r == 0)
+                                break;
 
-                r = parse_nice(eq, &n);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse nice value: %s", eq);
+                        s = source;
+                        if (s[0] == '-') {
+                                ignore_enoent = true;
+                                s++;
+                        }
 
-                r = sd_bus_message_append(m, "v", "i", (int32_t) n);
+                        if (p && p[-1] == ':') {
+                                r = extract_first_word(&p, &destination, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
+                                if (r < 0)
+                                        return log_error_errno(r, "Failed to parse argument: %m");
+                                if (r == 0) {
+                                        log_error("Missing argument after ':': %s", eq);
+                                        return -EINVAL;
+                                }
 
-        } else if (streq(field, "SystemCallFilter")) {
-                int whitelist;
-                _cleanup_strv_free_ char **l = NULL;
-                const char *p;
+                                d = destination;
 
-                p = eq;
-                if (*p == '~') {
-                        whitelist = 0;
-                        p++;
-                } else
-                        whitelist = 1;
+                                if (p && p[-1] == ':') {
+                                        _cleanup_free_ char *options = NULL;
 
-                if (whitelist != 0) {
-                        r = strv_extend(&l, "@default");
-                        if (r < 0)
-                                return log_oom();
-                }
+                                        r = extract_first_word(&p, &options, NULL, EXTRACT_QUOTES);
+                                        if (r < 0)
+                                                return log_error_errno(r, "Failed to parse argument: %m");
 
-                for (;;) {
-                        _cleanup_free_ char *word = NULL;
+                                        if (isempty(options) || streq(options, "rbind"))
+                                                flags = MS_REC;
+                                        else if (streq(options, "norbind"))
+                                                flags = 0;
+                                        else {
+                                                log_error("Unknown options: %s", eq);
+                                                return -EINVAL;
+                                        }
+                                }
+                        } else
+                                d = s;
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
-                        if (r == 0)
-                                break;
 
-                        r = strv_extend(&l, word);
+                        r = sd_bus_message_append(m, "(ssbt)", s, d, ignore_enoent, flags);
                         if (r < 0)
-                                return log_oom();
+                                return bus_log_create_error(r);
                 }
 
-                r = sd_bus_message_open_container(m, 'v', "(bas)");
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'r', "bas");
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_append_basic(m, 'b', &whitelist);
+                r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_append_strv(m, l);
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return 1;
+        }
 
-                r = sd_bus_message_close_container(m);
+        if (streq(field, "TemporaryFileSystem")) {
+                const char *p = eq;
+
+                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-        } else if (streq(field, "SystemCallArchitectures")) {
-                const char *p;
-
-                r = sd_bus_message_open_container(m, 'v', "as");
+                r = sd_bus_message_open_container(m, 'v', "a(ss)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'a', "s");
+                r = sd_bus_message_open_container(m, 'a', "(ss)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                for (p = eq;;) {
-                        _cleanup_free_ char *word = NULL;
+                for (;;) {
+                        _cleanup_free_ char *word = NULL, *path = NULL;
+                        const char *w;
 
                         r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
+                                return log_error_errno(r, "Failed to parse argument: %m");
                         if (r == 0)
                                 break;
 
-                        r = sd_bus_message_append_basic(m, 's', word);
+                        w = word;
+                        r = extract_first_word(&w, &path, ":", EXTRACT_DONT_COALESCE_SEPARATORS);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse argument: %m");
+                        if (r == 0)
+                                return log_error("Failed to parse argument: %m");
+
+                        r = sd_bus_message_append(m, "(ss)", path, w);
                         if (r < 0)
                                 return bus_log_create_error(r);
                 }
@@ -806,544 +1178,520 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                         return bus_log_create_error(r);
 
                 r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-        } else if (streq(field, "SystemCallErrorNumber")) {
-                int n;
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                n = parse_errno(eq);
-                if (n <= 0)
-                        return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
+                return 1;
+        }
 
-                r = sd_bus_message_append(m, "v", "i", (int32_t) n);
+        return 0;
+}
 
-        } else if (streq(field, "RestrictAddressFamilies")) {
-                int whitelist;
-                _cleanup_strv_free_ char **l = NULL;
-                const char *p = eq;
+static int bus_append_kill_property(sd_bus_message *m, const char *field, const char *eq) {
 
-                if (*p == '~') {
-                        whitelist = 0;
-                        p++;
-                } else
-                        whitelist = 1;
+        if (streq(field, "KillMode"))
 
-                for (;;) {
-                        _cleanup_free_ char *word = NULL;
+                return bus_append_string(m, field, eq);
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
-                        if (r == 0)
-                                break;
+        if (STR_IN_SET(field, "SendSIGHUP", "SendSIGKILL"))
 
-                        r = strv_extend(&l, word);
-                        if (r < 0)
-                                return log_oom();
-                }
+                return bus_append_parse_boolean(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'v', "(bas)");
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (streq(field, "KillSignal"))
 
-                r = sd_bus_message_open_container(m, 'r', "bas");
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return bus_append_signal_from_string_try_harder(m, field, eq);
 
-                r = sd_bus_message_append_basic(m, 'b', &whitelist);
-                if (r < 0)
-                        return bus_log_create_error(r);
+        return 0;
+}
 
-                r = sd_bus_message_append_strv(m, l);
-                if (r < 0)
-                        return bus_log_create_error(r);
+static int bus_append_mount_property(sd_bus_message *m, const char *field, const char *eq) {
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (STR_IN_SET(field, "What", "Where", "Options", "Type"))
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return bus_append_string(m, field, eq);
 
-        } else if (streq(field, "FileDescriptorStoreMax")) {
-                unsigned u;
+        if (streq(field, "TimeoutSec"))
 
-                r = safe_atou(eq, &u);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse file descriptor store limit: %s", eq);
+                return bus_append_parse_sec_rename(m, field, eq);
 
-                r = sd_bus_message_append(m, "v", "u", (uint32_t) u);
+        if (streq(field, "DirectoryMode"))
 
-        } else if (streq(field, "IOSchedulingClass")) {
-                int c;
+                return bus_append_parse_mode(m, field, eq);
 
-                c = ioprio_class_from_string(eq);
-                if (c < 0)
-                        return log_error_errno(r, "Failed to parse IO scheduling class: %s", eq);
+        if (STR_IN_SET(field, "SloppyOptions", "LazyUnmount", "ForceUnmount"))
 
-                r = sd_bus_message_append(m, "v", "i", (int32_t) c);
+                return bus_append_parse_boolean(m, field, eq);
 
-        } else if (streq(field, "IOSchedulingPriority")) {
-                int q;
+        return 0;
+}
 
-                r = ioprio_parse_priority(eq, &q);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse IO scheduling priority: %s", eq);
+static int bus_append_path_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
 
-                r = sd_bus_message_append(m, "v", "i", (int32_t) q);
+        if (streq(field, "MakeDirectory"))
 
-        } else if (STR_IN_SET(field, "Environment", "UnsetEnvironment", "PassEnvironment")) {
-                const char *p;
+                return bus_append_parse_boolean(m, field, eq);
+
+        if (streq(field, "DirectoryMode"))
+
+                return bus_append_parse_mode(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'v', "as");
+        if (STR_IN_SET(field,
+                       "PathExists", "PathExistsGlob", "PathChanged",
+                       "PathModified", "DirectoryNotEmpty")) {
+
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", "Paths", "a(ss)", 0);
+                else
+                        r = sd_bus_message_append(m, "(sv)", "Paths", "a(ss)", 1, field, eq);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'a', "s");
+                return 1;
+        }
+
+        return 0;
+}
+
+static int bus_append_service_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
+
+        if (STR_IN_SET(field,
+                       "PIDFile", "Type", "Restart", "BusName", "NotifyAccess",
+                       "USBFunctionDescriptors", "USBFunctionStrings"))
+
+                return bus_append_string(m, field, eq);
+
+        if (STR_IN_SET(field, "PermissionsStartOnly", "RootDirectoryStartOnly", "RemainAfterExit", "GuessMainPID"))
+
+                return bus_append_parse_boolean(m, field, eq);
+
+        if (STR_IN_SET(field, "RestartSec", "TimeoutStartSec", "TimeoutStopSec", "RuntimeMaxSec", "WatchdogSec"))
+
+                return bus_append_parse_sec_rename(m, field, eq);
+
+        if (streq(field, "TimeoutSec")) {
+
+                r = bus_append_parse_sec_rename(m, "TimeoutStartSec", eq);
                 if (r < 0)
-                        return bus_log_create_error(r);
+                        return r;
+
+                return bus_append_parse_sec_rename(m, "TimeoutStopSec", eq);
+        }
+
+        if (streq(field, "FileDescriptorStoreMax"))
+
+                return bus_append_safe_atou(m, field, eq);
+
+        if (STR_IN_SET(field,
+                       "ExecStartPre", "ExecStart", "ExecStartPost",
+                       "ExecReload", "ExecStop", "ExecStopPost"))
+
+                return bus_append_exec_command(m, field, eq);
+
+        if (STR_IN_SET(field, "RestartPreventExitStatus", "RestartForceExitStatus", "SuccessExitStatus")) {
+                _cleanup_free_ int *status = NULL, *signal = NULL;
+                size_t sz_status = 0, sz_signal = 0;
+                const char *p;
 
                 for (p = eq;;) {
                         _cleanup_free_ char *word = NULL;
+                        int val;
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse Environment value %s: %m", eq);
+                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
                         if (r == 0)
                                 break;
+                        if (r == -ENOMEM)
+                                return log_oom();
+                        if (r < 0)
+                                return log_error_errno(r, "Invalid syntax in %s: %s", field, eq);
 
-                        if (streq(field, "Environment")) {
-                                if (!env_assignment_is_valid(word)) {
-                                        log_error("Invalid environment assignment: %s", word);
-                                        return -EINVAL;
-                                }
-                        } else if (streq(field, "UnsetEnvironment")) {
-                                if (!env_assignment_is_valid(word) && !env_name_is_valid(word)) {
-                                        log_error("Invalid environment name or assignment: %s", word);
-                                        return -EINVAL;
-                                }
-                        } else {  /* PassEnvironment */
-                                if (!env_name_is_valid(word)) {
-                                        log_error("Invalid environment variable name: %s", word);
-                                        return -EINVAL;
-                                }
+                        r = safe_atoi(word, &val);
+                        if (r < 0) {
+                                val = signal_from_string_try_harder(word);
+                                if (val < 0)
+                                        return log_error_errno(r, "Invalid status or signal %s in %s: %m", word, field);
+
+                                signal = reallocarray(signal, sz_signal + 1, sizeof(int));
+                                if (!signal)
+                                        return log_oom();
+
+                                signal[sz_signal++] = val;
+                        } else {
+                                status = reallocarray(status, sz_status + 1, sizeof(int));
+                                if (!status)
+                                        return log_oom();
+
+                                status[sz_status++] = val;
                         }
+                }
+
+                r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_open_container(m, 'v', "(aiai)");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_open_container(m, 'r', "aiai");
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append_array(m, 'i', status, sz_status);
+                if (r < 0)
+                        return bus_log_create_error(r);
+
+                r = sd_bus_message_append_array(m, 'i', signal, sz_signal);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                        r = sd_bus_message_append_basic(m, 's', word);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-                }
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
                 r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-        } else if (streq(field, "KillSignal")) {
-                int sig;
+                return 1;
+        }
 
-                sig = signal_from_string_try_harder(eq);
-                if (sig < 0) {
-                        log_error("Failed to parse %s value %s.", field, eq);
-                        return -EINVAL;
-                }
+        return 0;
+}
 
-                r = sd_bus_message_append(m, "v", "i", sig);
+static int bus_append_socket_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
 
-        } else if (streq(field, "TimerSlackNSec")) {
-                nsec_t n;
+        if (STR_IN_SET(field,
+                       "Accept", "Writable", "KeepAlive", "NoDelay", "FreeBind", "Transparent", "Broadcast",
+                       "PassCredentials", "PassSecurity", "ReusePort", "RemoveOnStop", "SELinuxContextFromNet"))
 
-                r = parse_nsec(eq, &n);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                return bus_append_parse_boolean(m, field, eq);
 
-                r = sd_bus_message_append(m, "v", "t", n);
-        } else if (streq(field, "OOMScoreAdjust")) {
-                int oa;
+        if (STR_IN_SET(field, "Priority", "IPTTL", "Mark"))
 
-                r = safe_atoi(eq, &oa);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
+                return bus_append_safe_atoi(m, field, eq);
 
-                if (!oom_score_adjust_is_valid(oa)) {
-                        log_error("OOM score adjust value out of range");
-                        return -EINVAL;
-                }
+        if (streq(field, "IPTOS"))
 
-                r = sd_bus_message_append(m, "v", "i", oa);
+                return bus_append_ip_tos_from_string(m, field, eq);
 
-        } else if (STR_IN_SET(field, "ReadWriteDirectories", "ReadOnlyDirectories", "InaccessibleDirectories",
-                              "ReadWritePaths", "ReadOnlyPaths", "InaccessiblePaths")) {
-                const char *p;
+        if (STR_IN_SET(field, "Backlog", "MaxConnections", "MaxConnectionsPerSource", "KeepAliveProbes", "TriggerLimitBurst"))
 
-                r = sd_bus_message_open_container(m, 'v', "as");
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return bus_append_safe_atou(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'a', "s");
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (STR_IN_SET(field, "SocketMode", "DirectoryMode"))
 
-                for (p = eq;;) {
-                        _cleanup_free_ char *word = NULL;
-                        size_t offset;
+                return bus_append_parse_mode(m, field, eq);
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
-                        if (r == 0)
-                                break;
+        if (STR_IN_SET(field, "MessageQueueMaxMessages", "MessageQueueMessageSize"))
 
-                        if (!utf8_is_valid(word)) {
-                                log_error("Failed to parse %s value %s", field, eq);
-                                return -EINVAL;
-                        }
+                return bus_append_safe_atoi64(m, field, eq);
 
-                        offset = word[0] == '-';
-                        offset += word[offset] == '+';
+        if (STR_IN_SET(field, "TimeoutSec", "KeepAliveTimeSec", "KeepAliveIntervalSec", "DeferAcceptSec", "TriggerLimitIntervalSec"))
 
-                        if (!path_is_absolute(word + offset)) {
-                                log_error("Path specified by %s is not absolute: %s", field, eq);
-                                return -EINVAL;
-                        }
+                return bus_append_parse_sec_rename(m, field, eq);
 
-                        path_kill_slashes(word + offset);
+        if (STR_IN_SET(field, "ReceiveBuffer", "SendBuffer", "PipeSize"))
 
-                        r = sd_bus_message_append_basic(m, 's', word);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-                }
+                return bus_append_parse_size(m, field, eq, 1024);
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (STR_IN_SET(field, "ExecStartPre", "ExecStartPost", "ExecReload", "ExecStopPost"))
 
-                r = sd_bus_message_close_container(m);
+                return bus_append_exec_command(m, field, eq);
 
-        } else if (streq(field, "SupplementaryGroups")) {
-                const char *p;
+        if (STR_IN_SET(field,
+                       "SmackLabel", "SmackLabelIPIn", "SmackLabelIPOut", "TCPCongestion",
+                       "BindToDevice", "BindIPv6Only", "FileDescriptorName",
+                       "SocketUser", "SocketGroup"))
 
-                r = sd_bus_message_open_container(m, 'v', "as");
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return bus_append_string(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'a', "s");
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (streq(field, "Symlinks"))
 
-                for (p = eq;;) {
-                        _cleanup_free_ char *word = NULL;
+                return bus_append_strv(m, field, eq, EXTRACT_QUOTES);
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value %s: %m", field, eq);
-                        if (r == 0)
-                                break;
+        if (streq(field, "SocketProtocol"))
 
-                        if (!valid_user_group_name_or_id(word)) {
-                                log_error("Invalid group name or id is specified by %s: %s", field, eq);
-                                return -EINVAL;
-                        }
+                return bus_append_socket_protocol_from_name(m, field, eq);
 
-                        r = sd_bus_message_append_basic(m, 's', word);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-                }
+        if (STR_IN_SET(field,
+                       "ListenStream", "ListenDatagram", "ListenSequentialPacket", "ListenNetlink",
+                       "ListenSpecial", "ListenMessageQueue", "ListenFIFO", "ListenUSBFunction")) {
 
-                r = sd_bus_message_close_container(m);
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", "Listen", "a(ss)", 0);
+                else
+                        r = sd_bus_message_append(m, "(sv)", "Listen", "a(ss)", 1, field + STRLEN("Listen"), eq);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
-
-        } else if (STR_IN_SET(field,
-                              "RuntimeDirectoryMode", "StateDirectoryMode", "CacheDirectoryMode",
-                              "LogsDirectoryMode", "ConfigurationDirectoryMode", "UMask",
-                              "DirectoryMode")) {
-                mode_t mode;
+                return 1;
+        }
 
-                r = parse_mode(eq, &mode);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s value %s", field, eq);
+        return 0;
+}
+static int bus_append_timer_property(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
 
-                r = sd_bus_message_append(m, "v", "u", mode);
+        if (STR_IN_SET(field, "WakeSystem", "RemainAfterElapse", "Persistent"))
 
-        } else if (STR_IN_SET(field, "RuntimeDirectory", "StateDirectory", "CacheDirectory", "LogsDirectory", "ConfigurationDirectory")) {
-                const char *p;
+                return bus_append_parse_boolean(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'v', "as");
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (STR_IN_SET(field, "AccuracySec", "RandomizedDelaySec"))
 
-                r = sd_bus_message_open_container(m, 'a', "s");
-                if (r < 0)
-                        return bus_log_create_error(r);
+                return bus_append_parse_sec_rename(m, field, eq);
 
-                for (p = eq;;) {
-                        _cleanup_free_ char *word = NULL;
+        if (STR_IN_SET(field,
+                       "OnActiveSec", "OnBootSec", "OnStartupSec",
+                       "OnUnitActiveSec","OnUnitInactiveSec")) {
 
-                        r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
-                        if (r == -ENOMEM)
-                                return log_oom();
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 0);
+                else {
+                        usec_t t;
+                        r = parse_sec(eq, &t);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value %s", field, eq);
-                        if (r == 0)
-                                break;
+                                return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq);
 
-                        r = sd_bus_message_append_basic(m, 's', word);
-                        if (r < 0)
-                                return bus_log_create_error(r);
+                        r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 1, field, t);
                 }
-
-                r = sd_bus_message_close_container(m);
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_close_container(m);
-
-        } else if (streq(field, "RestrictNamespaces")) {
-                bool invert = false;
-                unsigned long flags = 0;
-
-                if (eq[0] == '~') {
-                        invert = true;
-                        eq++;
-                }
+                return 1;
+        }
 
-                r = parse_boolean(eq);
-                if (r > 0)
-                        flags = 0;
-                else if (r == 0)
-                        flags = NAMESPACE_FLAGS_ALL;
-                else {
-                        r = namespace_flag_from_string_many(eq, &flags);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s value %s.", field, eq);
-                }
+        if (streq(field, "OnCalendar")) {
 
-                if (invert)
-                        flags = (~flags) & NAMESPACE_FLAGS_ALL;
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 0);
+                else
+                        r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 1, field, eq);
+                if (r < 0)
+                        return bus_log_create_error(r);
 
-                r = sd_bus_message_append(m, "v", "t", (uint64_t) flags);
+                return 1;
+        }
 
-        } else if ((dep = unit_dependency_from_string(field)) >= 0)
+        return 0;
+}
 
-                r = sd_bus_message_append(m, "v", "as", 1, eq);
+static int bus_append_unit_property(sd_bus_message *m, const char *field, const char *eq) {
+        ConditionType t = _CONDITION_TYPE_INVALID;
+        bool is_condition = false;
+        int r;
 
-        else if (streq(field, "MountFlags")) {
-                unsigned long f;
+        if (STR_IN_SET(field,
+                       "Description", "SourcePath", "OnFailureJobMode",
+                       "JobTimeoutAction", "JobTimeoutRebootArgument",
+                       "StartLimitAction", "FailureAction", "SuccessAction",
+                       "RebootArgument", "CollectMode"))
 
-                r = mount_propagation_flags_from_string(eq, &f);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse mount propagation flags: %s", eq);
+                return bus_append_string(m, field, eq);
 
-                r = sd_bus_message_append(m, "v", "t", (uint64_t) f);
+        if (STR_IN_SET(field,
+                       "StopWhenUnneeded", "RefuseManualStart", "RefuseManualStop",
+                       "AllowIsolate", "IgnoreOnIsolate", "DefaultDependencies"))
 
-        } else if (STR_IN_SET(field, "BindPaths", "BindReadOnlyPaths")) {
-                const char *p = eq;
+                return bus_append_parse_boolean(m, field, eq);
 
-                r = sd_bus_message_open_container(m, 'v', "a(ssbt)");
-                if (r < 0)
-                        return r;
+        if (STR_IN_SET(field, "JobTimeoutSec", "JobRunningTimeoutSec", "StartLimitIntervalSec"))
 
-                r = sd_bus_message_open_container(m, 'a', "(ssbt)");
-                if (r < 0)
-                        return r;
+                return bus_append_parse_sec_rename(m, field, eq);
 
-                for (;;) {
-                        _cleanup_free_ char *source = NULL, *destination = NULL;
-                        char *s = NULL, *d = NULL;
-                        bool ignore_enoent = false;
-                        uint64_t flags = MS_REC;
+        if (streq(field, "StartLimitBurst"))
 
-                        r = extract_first_word(&p, &source, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse argument: %m");
-                        if (r == 0)
-                                break;
+                return bus_append_safe_atou(m, field, eq);
 
-                        s = source;
-                        if (s[0] == '-') {
-                                ignore_enoent = true;
-                                s++;
-                        }
+        if (unit_dependency_from_string(field) >= 0 ||
+            STR_IN_SET(field, "Documentation", "RequiresMountsFor"))
 
-                        if (p && p[-1] == ':') {
-                                r = extract_first_word(&p, &destination, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
-                                if (r < 0)
-                                        return log_error_errno(r, "Failed to parse argument: %m");
-                                if (r == 0) {
-                                        log_error("Missing argument after ':': %s", eq);
-                                        return -EINVAL;
-                                }
+                return bus_append_strv(m, field, eq, EXTRACT_QUOTES);
 
-                                d = destination;
+        t = condition_type_from_string(field);
+        if (t >= 0)
+                is_condition = true;
+        else
+                t = assert_type_from_string(field);
+        if (t >= 0) {
+                if (isempty(eq))
+                        r = sd_bus_message_append(m, "(sv)", is_condition ? "Conditions" : "Asserts", "a(sbbs)", 0);
+                else {
+                        const char *p = eq;
+                        int trigger, negate;
 
-                                if (p && p[-1] == ':') {
-                                        _cleanup_free_ char *options = NULL;
+                        trigger = *p == '|';
+                        if (trigger)
+                                p++;
 
-                                        r = extract_first_word(&p, &options, NULL, EXTRACT_QUOTES);
-                                        if (r < 0)
-                                                return log_error_errno(r, "Failed to parse argument: %m");
+                        negate = *p == '!';
+                        if (negate)
+                                p++;
 
-                                        if (isempty(options) || streq(options, "rbind"))
-                                                flags = MS_REC;
-                                        else if (streq(options, "norbind"))
-                                                flags = 0;
-                                        else {
-                                                log_error("Unknown options: %s", eq);
-                                                return -EINVAL;
-                                        }
-                                }
-                        } else
-                                d = s;
+                        r = sd_bus_message_append(m, "(sv)", is_condition ? "Conditions" : "Asserts", "a(sbbs)", 1,
+                                                  field, trigger, negate, p);
+                }
+                if (r < 0)
+                        return bus_log_create_error(r);
 
+                return 1;
+        }
 
-                        r = sd_bus_message_append(m, "(ssbt)", s, d, ignore_enoent, flags);
-                        if (r < 0)
-                                return r;
-                }
+        return 0;
+}
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
-                        return r;
+int bus_append_unit_property_assignment(sd_bus_message *m, UnitType t, const char *assignment) {
+        const char *eq, *field;
+        int r;
 
-                r = sd_bus_message_close_container(m);
+        assert(m);
+        assert(assignment);
 
-        } else if (STR_IN_SET(field, "ExecStartPre", "ExecStart", "ExecStartPost",
-                              "ExecReload", "ExecStop", "ExecStopPost")) {
+        eq = strchr(assignment, '=');
+        if (!eq) {
+                log_error("Not an assignment: %s", assignment);
+                return -EINVAL;
+        }
 
-                bool ignore_failure = false, explicit_path = false, done = false;
-                _cleanup_strv_free_ char **l = NULL;
-                _cleanup_free_ char *path = NULL;
+        field = strndupa(assignment, eq - assignment);
+        eq++;
 
-                do {
-                        switch (*eq) {
+        switch (t) {
+        case UNIT_SERVICE:
+                r = bus_append_cgroup_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                        case '-':
-                                if (ignore_failure)
-                                        done = true;
-                                else {
-                                        ignore_failure = true;
-                                        eq++;
-                                }
-                                break;
+                r = bus_append_execute_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                        case '@':
-                                if (explicit_path)
-                                        done = true;
-                                else {
-                                        explicit_path = true;
-                                        eq++;
-                                }
-                                break;
+                r = bus_append_kill_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                        case '+':
-                        case '!':
-                                /* The bus API doesn't support +, ! and !! currently, unfortunately. :-( */
-                                log_error("Sorry, but +, ! and !! are currently not supported for transient services.");
-                                return -EOPNOTSUPP;
+                r = bus_append_service_property(m, field, eq);
+                if (r != 0)
+                        return r;
+                break;
 
-                        default:
-                                done = true;
-                                break;
-                        }
-                } while (!done);
+        case UNIT_SOCKET:
+                r = bus_append_cgroup_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                if (explicit_path) {
-                        r = extract_first_word(&eq, &path, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse path: %m");
-                }
+                r = bus_append_execute_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                r = strv_split_extract(&l, eq, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse command line: %m");
+                r = bus_append_kill_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                r = sd_bus_message_open_container(m, 'v', "a(sasb)");
-                if (r < 0)
+                r = bus_append_socket_property(m, field, eq);
+                if (r != 0)
                         return r;
+                break;
 
-                r = sd_bus_message_open_container(m, 'a', "(sasb)");
-                if (r < 0)
+        case UNIT_TIMER:
+                r = bus_append_timer_property(m, field, eq);
+                if (r != 0)
                         return r;
+                break;
 
-                if (strv_length(l) > 0) {
+        case UNIT_PATH:
+                r = bus_append_path_property(m, field, eq);
+                if (r != 0)
+                        return r;
+                break;
 
-                        r = sd_bus_message_open_container(m, 'r', "sasb");
-                        if (r < 0)
-                                return r;
+        case UNIT_SLICE:
+                r = bus_append_cgroup_property(m, field, eq);
+                if (r != 0)
+                        return r;
+                break;
 
-                        r = sd_bus_message_append(m, "s", path ?: l[0]);
-                        if (r < 0)
-                                return r;
+        case UNIT_SCOPE:
 
-                        r = sd_bus_message_append_strv(m, l);
-                        if (r < 0)
-                                return r;
+                if (streq(field, "TimeoutStopSec"))
+                        return bus_append_parse_sec_rename(m, field, eq);
 
-                        r = sd_bus_message_append(m, "b", ignore_failure);
-                        if (r < 0)
-                                return r;
+                r = bus_append_cgroup_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                        r = sd_bus_message_close_container(m);
-                        if (r < 0)
-                                return r;
-                }
+                r = bus_append_kill_property(m, field, eq);
+                if (r != 0)
+                        return r;
+                break;
 
-                r = sd_bus_message_close_container(m);
-                if (r < 0)
+        case UNIT_MOUNT:
+                r = bus_append_cgroup_property(m, field, eq);
+                if (r != 0)
                         return r;
 
-                r = sd_bus_message_close_container(m);
+                r = bus_append_execute_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-        } else if (STR_IN_SET(field,
-                              "OnActiveSec", "OnBootSec", "OnStartupSec",
-                              "OnUnitActiveSec","OnUnitInactiveSec")) {
-                usec_t t;
+                r = bus_append_kill_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                r = parse_sec(eq, &t);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to parse %s= parameter: %s", field, eq);
+                r = bus_append_mount_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                r = sd_bus_message_append(m, "v", "t", t);
+                break;
 
-        } else if (STR_IN_SET(field,
-                              "PathExists", "PathExistsGlob", "PathChanged",
-                              "PathModified", "DirectoryNotEmpty")) {
+        case UNIT_AUTOMOUNT:
+                r = bus_append_automount_property(m, field, eq);
+                if (r != 0)
+                        return r;
 
-                if (!path_is_absolute(eq)) {
-                        log_error("Path specified by %s= is not absolute: %s", field, eq);
-                        return -EINVAL;
-                }
+                break;
 
-                r = sd_bus_message_append(m, "v", "s", eq);
+        case UNIT_TARGET:
+        case UNIT_DEVICE:
+        case UNIT_SWAP:
+                log_error("Not supported unit type");
+                return -EINVAL;
 
-        } else {
-                log_error("Unknown assignment: %s", assignment);
+        default:
+                log_error("Invalid unit type");
                 return -EINVAL;
         }
 
-finish:
-        if (r < 0)
-                return bus_log_create_error(r);
-
-        r = sd_bus_message_close_container(m);
-        if (r < 0)
-                return bus_log_create_error(r);
+        r = bus_append_unit_property(m, field, eq);
+        if (r != 0)
+                return r;
 
-        return 0;
+        log_error("Unknown assignment: %s", assignment);
+        return -EINVAL;
 }
 
-int bus_append_unit_property_assignment_many(sd_bus_message *m, char **l) {
+int bus_append_unit_property_assignment_many(sd_bus_message *m, UnitType t, char **l) {
         char **i;
         int r;
 
         assert(m);
 
         STRV_FOREACH(i, l) {
-                r = bus_append_unit_property_assignment(m, *i);
+                r = bus_append_unit_property_assignment(m, t, *i);
                 if (r < 0)
                         return r;
         }
@@ -1435,36 +1783,29 @@ int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret) {
         /* When we are a bus client we match by sender. Direct
          * connections OTOH have no initialized sender field, and
          * hence we ignore the sender then */
-        r = sd_bus_add_match(
+        r = sd_bus_match_signal_async(
                         bus,
                         &d->slot_job_removed,
-                        bus->bus_client ?
-                        "type='signal',"
-                        "sender='org.freedesktop.systemd1',"
-                        "interface='org.freedesktop.systemd1.Manager',"
-                        "member='JobRemoved',"
-                        "path='/org/freedesktop/systemd1'" :
-                        "type='signal',"
-                        "interface='org.freedesktop.systemd1.Manager',"
-                        "member='JobRemoved',"
-                        "path='/org/freedesktop/systemd1'",
-                        match_job_removed, d);
+                        bus->bus_client ? "org.freedesktop.systemd1" : NULL,
+                        "/org/freedesktop/systemd1",
+                        "org.freedesktop.systemd1.Manager",
+                        "JobRemoved",
+                        match_job_removed, NULL, d);
         if (r < 0)
                 return r;
 
-        r = sd_bus_add_match(
+        r = sd_bus_match_signal_async(
                         bus,
                         &d->slot_disconnected,
-                        "type='signal',"
-                        "sender='org.freedesktop.DBus.Local',"
-                        "interface='org.freedesktop.DBus.Local',"
-                        "member='Disconnected'",
-                        match_disconnected, d);
+                        "org.freedesktop.DBus.Local",
+                        NULL,
+                        "org.freedesktop.DBus.Local",
+                        "Disconnected",
+                        match_disconnected, NULL, d);
         if (r < 0)
                 return r;
 
-        *ret = d;
-        d = NULL;
+        *ret = TAKE_PTR(d);
 
         return 0;
 }
@@ -2080,7 +2421,7 @@ int unit_show_processes(
         if (r < 0)
                 return r;
 
-        cgroups = hashmap_new(&string_hash_ops);
+        cgroups = hashmap_new(&path_hash_ops);
         if (!cgroups)
                 return -ENOMEM;