logind-dbus: avoid assertion on HandlePowerKey=factory-reset

The factory-reset action is handled together with the various
sleep/shutdown actions, but its not either one.

Fixes #39385

src/core/load-fragment.c

@@ -4418,7 +4418,7 @@ int config_parse_io_limit(
         if (r < 0)
                 return 0;
 
-        if (streq("infinity", p))
+        if (streq(p, "infinity"))
                 num = CGROUP_LIMIT_MAX;
         else {
                 r = parse_size(p, 1000, &num);

src/integritysetup/integritysetup.c

@@ -75,13 +75,13 @@ static const char *integrity_algorithm_select(const void *key_file_buf) {
         /*  To keep a bit of sanity for end users, the subset of integrity
             algorithms we support will match what is used in integritysetup */
         if (arg_integrity_algorithm) {
-                if (streq("hmac-sha256", arg_integrity_algorithm))
+                if (streq(arg_integrity_algorithm, "hmac-sha256"))
                         return DM_HMAC_256;
-                if (streq("hmac-sha512", arg_integrity_algorithm))
+                if (streq(arg_integrity_algorithm, "hmac-sha512"))
                         return DM_HMAC_512;
-                if (streq("phmac-sha256", arg_integrity_algorithm))
+                if (streq(arg_integrity_algorithm, "phmac-sha256"))
                         return DM_PHMAC_256;
-                if (streq("phmac-sha512", arg_integrity_algorithm))
+                if (streq(arg_integrity_algorithm, "phmac-sha512"))
                         return DM_PHMAC_512;
                 return arg_integrity_algorithm;
         } else if (key_file_buf)

src/libsystemd-network/dhcp-lease-internal.h

@@ -66,7 +66,8 @@ struct sd_dhcp_lease {
 
         char *domainname;
         char **search_domains;
-        char *hostname;
+        char *hostname; /* SD_DHCP_OPTION_HOST_NAME (12) */
+        char *fqdn;     /* SD_DHCP_OPTION_FQDN (81) */
         char *root_path;
         char *captive_portal;
 

src/libsystemd-network/network-internal.c

@@ -261,8 +261,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
                 if (r == 0)
                         break;
 
-                if (!GREEDY_REALLOC(routes, size + 1))
-                        return -ENOMEM;
+                struct sd_dhcp_route route = {};
 
                 tok = word;
 
@@ -272,7 +271,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
                         continue;
                 *tok_end = '\0';
 
-                r = inet_aton(tok, &routes[size].dst_addr);
+                r = inet_aton(tok, &route.dst_addr);
                 if (r == 0)
                         continue;
 
@@ -289,15 +288,18 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
                 if (r < 0 || n > 32)
                         continue;
 
-                routes[size].dst_prefixlen = (uint8_t) n;
+                route.dst_prefixlen = (uint8_t) n;
                 tok = tok_end + 1;
 
                 /* get the gateway */
-                r = inet_aton(tok, &routes[size].gw_addr);
+                r = inet_aton(tok, &route.gw_addr);
                 if (r == 0)
                         continue;
 
-                size++;
+                if (!GREEDY_REALLOC(routes, size + 1))
+                        return -ENOMEM;
+
+                routes[size++] = route;
         }
 
         *ret_size = size;

src/libsystemd-network/sd-dhcp-lease.c

@@ -199,10 +199,15 @@ int sd_dhcp_lease_get_hostname(sd_dhcp_lease *lease, const char **hostname) {
         assert_return(lease, -EINVAL);
         assert_return(hostname, -EINVAL);
 
-        if (!lease->hostname)
+        /* FQDN option (81) always takes precedence. */
+
+        if (lease->fqdn)
+                *hostname = lease->fqdn;
+        else if (lease->hostname)
+                *hostname = lease->hostname;
+        else
                 return -ENODATA;
 
-        *hostname = lease->hostname;
         return 0;
 }
 
@@ -422,6 +427,7 @@ static sd_dhcp_lease *dhcp_lease_free(sd_dhcp_lease *lease) {
         free(lease->router);
         free(lease->timezone);
         free(lease->hostname);
+        free(lease->fqdn);
         free(lease->domainname);
         free(lease->captive_portal);
 
@@ -475,18 +481,18 @@ static int lease_parse_be32(const uint8_t *option, size_t len, be32_t *ret) {
         return 0;
 }
 
-static int lease_parse_domain(const uint8_t *option, size_t len, char **ret) {
+static int lease_parse_domain(const uint8_t *option, size_t len, char **domain) {
         _cleanup_free_ char *name = NULL, *normalized = NULL;
         int r;
 
         assert(option);
-        assert(ret);
+        assert(domain);
 
         r = dhcp_option_parse_string(option, len, &name);
         if (r < 0)
                 return r;
         if (!name) {
-                *ret = mfree(*ret);
+                *domain = mfree(*domain);
                 return 0;
         }
 
@@ -500,17 +506,15 @@ static int lease_parse_domain(const uint8_t *option, size_t len, char **ret) {
         if (dns_name_is_root(normalized))
                 return -EINVAL;
 
-        free_and_replace(*ret, normalized);
-
-        return 0;
+        return free_and_replace(*domain, normalized);
 }
 
-static int lease_parse_fqdn(const uint8_t *option, size_t len, char **hostname) {
+static int lease_parse_fqdn(const uint8_t *option, size_t len, char **fqdn) {
         _cleanup_free_ char *name = NULL, *normalized = NULL;
         int r;
 
         assert(option);
-        assert(hostname);
+        assert(fqdn);
 
         /* RFC 4702 Section 2
          *
@@ -540,7 +544,7 @@ static int lease_parse_fqdn(const uint8_t *option, size_t len, char **hostname)
         }
 
         if (!name) {
-                *hostname = mfree(*hostname);
+                *fqdn = mfree(*fqdn);
                 return 0;
         }
 
@@ -554,59 +558,52 @@ static int lease_parse_fqdn(const uint8_t *option, size_t len, char **hostname)
         if (dns_name_is_root(normalized))
                 return -EINVAL;
 
-        free_and_replace(*hostname, normalized);
-
-        return 0;
+        return free_and_replace(*fqdn, normalized);
 }
 
-static int lease_parse_captive_portal(const uint8_t *option, size_t len, char **ret) {
-        _cleanup_free_ char *uri = NULL;
+static int lease_parse_captive_portal(const uint8_t *option, size_t len, char **uri) {
+        _cleanup_free_ char *s = NULL;
         int r;
 
         assert(option);
-        assert(ret);
+        assert(uri);
 
-        r = dhcp_option_parse_string(option, len, &uri);
+        r = dhcp_option_parse_string(option, len, &s);
         if (r < 0)
                 return r;
-        if (uri && !in_charset(uri, URI_VALID))
+        if (s && !in_charset(s, URI_VALID))
                 return -EINVAL;
 
-        return free_and_replace(*ret, uri);
+        return free_and_replace(*uri, s);
 }
 
-static int lease_parse_in_addrs(const uint8_t *option, size_t len, struct in_addr **ret, size_t *n_ret) {
+static int lease_parse_in_addrs(const uint8_t *option, size_t len, struct in_addr **addresses, size_t *n_addresses) {
         assert(option || len == 0);
-        assert(ret);
-        assert(n_ret);
+        assert(addresses);
+        assert(n_addresses);
 
         if (len <= 0) {
-                *ret = mfree(*ret);
-                *n_ret = 0;
-        } else {
-                size_t n_addresses;
-                struct in_addr *addresses;
-
-                if (len % 4 != 0)
-                        return -EINVAL;
-
-                n_addresses = len / 4;
-
-                addresses = newdup(struct in_addr, option, n_addresses);
-                if (!addresses)
-                        return -ENOMEM;
-
-                free_and_replace(*ret, addresses);
-                *n_ret = n_addresses;
+                *n_addresses = 0;
+                *addresses = mfree(*addresses);
+                return 0;
         }
 
-        return 0;
+        if (len % 4 != 0)
+                return -EINVAL;
+
+        size_t n = len / 4;
+        struct in_addr *a = newdup(struct in_addr, option, n);
+        if (!a)
+                return -ENOMEM;
+
+        *n_addresses = n;
+        return free_and_replace(*addresses, a);
 }
 
-static int lease_parse_sip_server(const uint8_t *option, size_t len, struct in_addr **ret, size_t *n_ret) {
+static int lease_parse_sip_server(const uint8_t *option, size_t len, struct in_addr **sips, size_t *n_sips) {
         assert(option || len == 0);
-        assert(ret);
-        assert(n_ret);
+        assert(sips);
+        assert(n_sips);
 
         if (len <= 0)
                 return -EINVAL;
@@ -616,12 +613,12 @@ static int lease_parse_sip_server(const uint8_t *option, size_t len, struct in_a
          * the other fields */
 
         if (option[0] != 1) { /* We only support IP address encoding for now */
-                *ret = mfree(*ret);
-                *n_ret = 0;
+                *sips = mfree(*sips);
+                *n_sips = 0;
                 return 0;
         }
 
-        return lease_parse_in_addrs(option + 1, len - 1, ret, n_ret);
+        return lease_parse_in_addrs(option + 1, len - 1, sips, n_sips);
 }
 
 static int lease_parse_dns_name(const uint8_t *optval, size_t optlen, char **ret) {
@@ -641,14 +638,15 @@ static int lease_parse_dns_name(const uint8_t *optval, size_t optlen, char **ret
         return r;
 }
 
-static int lease_parse_dnr(const uint8_t *option, size_t len, sd_dns_resolver **ret_dnr, size_t *ret_n_dnr) {
+static int lease_parse_dnr(const uint8_t *option, size_t len, sd_dns_resolver **dnr, size_t *n_dnr) {
         int r;
         sd_dns_resolver *res_list = NULL;
         size_t n_resolvers = 0;
         CLEANUP_ARRAY(res_list, n_resolvers, dns_resolver_done_many);
 
         assert(option || len == 0);
-        assert(ret_dnr);
+        assert(dnr);
+        assert(n_dnr);
 
         _cleanup_(sd_dns_resolver_done) sd_dns_resolver res = {};
 
@@ -747,11 +745,11 @@ static int lease_parse_dnr(const uint8_t *option, size_t len, sd_dns_resolver **
                 res_list[n_resolvers++] = TAKE_STRUCT(res);
         }
 
-        typesafe_qsort(*ret_dnr, *ret_n_dnr, dns_resolver_prio_compare);
+        typesafe_qsort(res_list, n_resolvers, dns_resolver_prio_compare);
 
-        dns_resolver_done_many(*ret_dnr, *ret_n_dnr);
-        *ret_dnr = TAKE_PTR(res_list);
-        *ret_n_dnr = n_resolvers;
+        dns_resolver_done_many(*dnr, *n_dnr);
+        *dnr = TAKE_PTR(res_list);
+        *n_dnr = n_resolvers;
 
         return n_resolvers;
 }
@@ -1021,12 +1019,6 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
                 break;
 
         case SD_DHCP_OPTION_HOST_NAME:
-                /* FQDN option (81) always takes precedence. If it was already set, do not overwrite it. */
-                if (lease->hostname) {
-                        log_debug("Hostname already set via FQDN, ignoring hostname option.");
-                        break;
-                }
-
                 r = lease_parse_domain(option, len, &lease->hostname);
                 if (r < 0) {
                         log_debug_errno(r, "Failed to parse hostname, ignoring: %m");
@@ -1036,7 +1028,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
                 break;
 
         case SD_DHCP_OPTION_FQDN:
-                r = lease_parse_fqdn(option, len, &lease->hostname);
+                r = lease_parse_fqdn(option, len, &lease->fqdn);
                 if (r < 0) {
                         log_debug_errno(r, "Failed to parse FQDN, ignoring: %m");
                         return 0;

src/libsystemd/sd-netlink/test-netlink.c

@@ -383,14 +383,14 @@ TEST(message_container) {
 
         ASSERT_OK(sd_netlink_message_enter_container(m, IFLA_LINKINFO));
         ASSERT_OK(sd_netlink_message_read_string(m, IFLA_INFO_KIND, &string_data));
-        ASSERT_STREQ("vlan", string_data);
+        ASSERT_STREQ(string_data, "vlan");
 
         ASSERT_OK(sd_netlink_message_enter_container(m, IFLA_INFO_DATA));
         ASSERT_OK(sd_netlink_message_read_u16(m, IFLA_VLAN_ID, &u16_data));
         ASSERT_OK(sd_netlink_message_exit_container(m));
 
         ASSERT_OK(sd_netlink_message_read_string(m, IFLA_INFO_KIND, &string_data));
-        ASSERT_STREQ("vlan", string_data);
+        ASSERT_STREQ(string_data, "vlan");
         ASSERT_OK(sd_netlink_message_exit_container(m));
 
         ASSERT_FAIL(sd_netlink_message_read_u32(m, IFLA_LINKINFO, &u32_data));

src/login/logind-dbus.c

@@ -1946,6 +1946,11 @@ static int send_prepare_for(Manager *m, const HandleActionData *a, bool _active)
 
         assert(m);
         assert(a);
+
+        /* Only sleep/shutdown actions emit a signal */
+        if (a->inhibit_what < 0)
+                return 0;
+
         assert(IN_SET(a->inhibit_what, INHIBIT_SHUTDOWN, INHIBIT_SLEEP));
 
         /* We need to send both old and new signal for backward compatibility. The newer one allows clients
@@ -2163,6 +2168,7 @@ int bus_manager_shutdown_or_sleep_now_or_later(
 
         delayed =
                 m->inhibit_delay_max > 0 &&
+                a->inhibit_what >= 0 &&
                 manager_is_inhibited(m, a->inhibit_what, NULL, MANAGER_IS_INHIBITED_CHECK_DELAY, UID_INVALID, NULL);
 
         if (delayed)

src/network/networkd-dhcp-server-static-lease.c

@@ -249,18 +249,8 @@ int config_parse_dhcp_static_lease_hostname(
         }
 
         r = dns_name_is_valid_ldh(rvalue);
-        if (r < 0)
+        if (r <= 0)
                 return log_syntax_parse_error(unit, filename, line, r, lvalue, rvalue);
-        if (r == 0) {
-                log_syntax(unit,
-                           LOG_WARNING,
-                           filename,
-                           line,
-                           0,
-                           "Invalid hostname for DHCPv4 static lease, ignoring assignment: %s",
-                           rvalue);
-                return 0;
-        }
 
         r = free_and_strdup(&lease->hostname, rvalue);
         if (r < 0)

src/network/test-network.c

@@ -13,91 +13,78 @@
 #include "strv.h"
 #include "tests.h"
 
-static void test_deserialize_in_addr(void) {
+TEST(deserialize_in_addr) {
         _cleanup_free_ struct in_addr *addresses = NULL;
         _cleanup_free_ struct in6_addr *addresses6 = NULL;
         union in_addr_union a, b, c, d, e, f;
-        int size;
-        const char *addresses_string = "192.168.0.1 0:0:0:0:0:FFFF:204.152.189.116 192.168.0.2 ::1 192.168.0.3 1:0:0:0:0:0:0:8";
+        static const char *addresses_string = "192.168.0.1 0:0:0:0:0:FFFF:204.152.189.116 192.168.0.2 ::1 192.168.0.3 1:0:0:0:0:0:0:8";
 
-        assert_se(in_addr_from_string(AF_INET, "0:0:0:0:0:FFFF:204.152.189.116", &a) < 0);
-        assert_se(in_addr_from_string(AF_INET6, "192.168.0.1", &d) < 0);
+        ASSERT_ERROR(in_addr_from_string(AF_INET, "0:0:0:0:0:FFFF:204.152.189.116", &a), EINVAL);
+        ASSERT_ERROR(in_addr_from_string(AF_INET6, "192.168.0.1", &d), EINVAL);
 
-        assert_se(in_addr_from_string(AF_INET, "192.168.0.1", &a) >= 0);
-        assert_se(in_addr_from_string(AF_INET, "192.168.0.2", &b) >= 0);
-        assert_se(in_addr_from_string(AF_INET, "192.168.0.3", &c) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "0:0:0:0:0:FFFF:204.152.189.116", &d) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "::1", &e) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "1:0:0:0:0:0:0:8", &f) >= 0);
+        ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.1", &a));
+        ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.2", &b));
+        ASSERT_OK(in_addr_from_string(AF_INET, "192.168.0.3", &c));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "0:0:0:0:0:FFFF:204.152.189.116", &d));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "::1", &e));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "1:0:0:0:0:0:0:8", &f));
 
-        assert_se((size = deserialize_in_addrs(&addresses, addresses_string)) >= 0);
-        assert_se(size == 3);
-        assert_se(in4_addr_equal(&a.in, &addresses[0]));
-        assert_se(in4_addr_equal(&b.in, &addresses[1]));
-        assert_se(in4_addr_equal(&c.in, &addresses[2]));
+        ASSERT_OK_EQ(deserialize_in_addrs(&addresses, addresses_string), 3);
+        ASSERT_NOT_NULL(addresses);
+        ASSERT_TRUE(in4_addr_equal(&a.in, &addresses[0]));
+        ASSERT_TRUE(in4_addr_equal(&b.in, &addresses[1]));
+        ASSERT_TRUE(in4_addr_equal(&c.in, &addresses[2]));
 
-        assert_se((size = deserialize_in6_addrs(&addresses6, addresses_string)) >= 0);
-        assert_se(size == 3);
-        assert_se(in6_addr_equal(&d.in6, &addresses6[0]));
-        assert_se(in6_addr_equal(&e.in6, &addresses6[1]));
-        assert_se(in6_addr_equal(&f.in6, &addresses6[2]));
+        ASSERT_OK_EQ(deserialize_in6_addrs(&addresses6, addresses_string), 3);
+        ASSERT_NOT_NULL(addresses6);
+        ASSERT_TRUE(in6_addr_equal(&d.in6, &addresses6[0]));
+        ASSERT_TRUE(in6_addr_equal(&e.in6, &addresses6[1]));
+        ASSERT_TRUE(in6_addr_equal(&f.in6, &addresses6[2]));
 }
 
-static void test_deserialize_dhcp_routes(void) {
+TEST(deserialize_dhcp_routes) {
+        _cleanup_free_ struct sd_dhcp_route *routes = NULL;
         size_t size;
 
-        {
-                _cleanup_free_ struct sd_dhcp_route *routes = NULL;
-                assert_se(deserialize_dhcp_routes(&routes, &size, "") >= 0);
-                assert_se(size == 0);
-        }
+        ASSERT_OK(deserialize_dhcp_routes(&routes, &size, ""));
+        ASSERT_EQ(size, 0U);
+        ASSERT_NULL(routes);
 
-        {
-                /* no errors */
-                _cleanup_free_ struct sd_dhcp_route *routes = NULL;
-                const char *routes_string = "192.168.0.0/16,192.168.0.1 10.1.2.0/24,10.1.2.1 0.0.0.0/0,10.0.1.1";
+        ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/16,192.168.0.1 10.1.2.0/24,10.1.2.1 0.0.0.0/0,10.0.1.1"));
+        ASSERT_EQ(size, 3U);
+        ASSERT_NOT_NULL(routes);
 
-                assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0);
+        ASSERT_EQ(routes[0].dst_addr.s_addr, inet_addr("192.168.0.0"));
+        ASSERT_EQ(routes[0].gw_addr.s_addr, inet_addr("192.168.0.1"));
+        ASSERT_EQ(routes[0].dst_prefixlen, 16U);
 
-                assert_se(size == 3);
-                assert_se(routes[0].dst_addr.s_addr == inet_addr("192.168.0.0"));
-                assert_se(routes[0].gw_addr.s_addr == inet_addr("192.168.0.1"));
-                assert_se(routes[0].dst_prefixlen == 16);
+        ASSERT_EQ(routes[1].dst_addr.s_addr, inet_addr("10.1.2.0"));
+        ASSERT_EQ(routes[1].gw_addr.s_addr, inet_addr("10.1.2.1"));
+        ASSERT_EQ(routes[1].dst_prefixlen, 24U);
 
-                assert_se(routes[1].dst_addr.s_addr == inet_addr("10.1.2.0"));
-                assert_se(routes[1].gw_addr.s_addr == inet_addr("10.1.2.1"));
-                assert_se(routes[1].dst_prefixlen == 24);
+        ASSERT_EQ(routes[2].dst_addr.s_addr, inet_addr("0.0.0.0"));
+        ASSERT_EQ(routes[2].gw_addr.s_addr, inet_addr("10.0.1.1"));
+        ASSERT_EQ(routes[2].dst_prefixlen, 0U);
 
-                assert_se(routes[2].dst_addr.s_addr == inet_addr("0.0.0.0"));
-                assert_se(routes[2].gw_addr.s_addr == inet_addr("10.0.1.1"));
-                assert_se(routes[2].dst_prefixlen == 0);
-        }
+        routes = mfree(routes);
 
-        {
-                /* error in second word */
-                _cleanup_free_ struct sd_dhcp_route *routes = NULL;
-                const char *routes_string = "192.168.0.0/16,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.1";
+        ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/16,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.1"));
+        ASSERT_EQ(size, 2U);
+        ASSERT_NOT_NULL(routes);
 
-                assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0);
+        ASSERT_EQ(routes[0].dst_addr.s_addr, inet_addr("192.168.0.0"));
+        ASSERT_EQ(routes[0].gw_addr.s_addr, inet_addr("192.168.0.1"));
+        ASSERT_EQ(routes[0].dst_prefixlen, 16U);
 
-                assert_se(size == 2);
-                assert_se(routes[0].dst_addr.s_addr == inet_addr("192.168.0.0"));
-                assert_se(routes[0].gw_addr.s_addr == inet_addr("192.168.0.1"));
-                assert_se(routes[0].dst_prefixlen == 16);
+        ASSERT_EQ(routes[1].dst_addr.s_addr, inet_addr("0.0.0.0"));
+        ASSERT_EQ(routes[1].gw_addr.s_addr, inet_addr("10.0.1.1"));
+        ASSERT_EQ(routes[1].dst_prefixlen, 0U);
 
-                assert_se(routes[1].dst_addr.s_addr == inet_addr("0.0.0.0"));
-                assert_se(routes[1].gw_addr.s_addr == inet_addr("10.0.1.1"));
-                assert_se(routes[1].dst_prefixlen == 0);
-        }
+        routes = mfree(routes);
 
-        {
-                /* error in every word */
-                _cleanup_free_ struct sd_dhcp_route *routes = NULL;
-                const char *routes_string = "192.168.0.0/55,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.X";
-
-                assert_se(deserialize_dhcp_routes(&routes, &size, routes_string) >= 0);
-                assert_se(size == 0);
-        }
+        ASSERT_OK(deserialize_dhcp_routes(&routes, &size, "192.168.0.0/55,192.168.0.1 10.1.2.0#24,10.1.2.1 0.0.0.0/0,10.0.1.X"));
+        ASSERT_EQ(size, 0U);
+        ASSERT_NULL(routes);
 }
 
 static void test_route_tables_one(Manager *manager, const char *name, uint32_t number) {
@@ -105,31 +92,36 @@ static void test_route_tables_one(Manager *manager, const char *name, uint32_t n
         uint32_t t;
 
         if (!STR_IN_SET(name, "default", "main", "local")) {
-                assert_se(streq(hashmap_get(manager->route_table_names_by_number, UINT32_TO_PTR(number)), name));
-                assert_se(PTR_TO_UINT32(hashmap_get(manager->route_table_numbers_by_name, name)) == number);
+                ASSERT_STREQ(hashmap_get(manager->route_table_names_by_number, UINT32_TO_PTR(number)), name);
+                ASSERT_EQ(PTR_TO_UINT32(hashmap_get(manager->route_table_numbers_by_name, name)), number);
         }
 
-        assert_se(asprintf(&expected, "%s(%" PRIu32 ")", name, number) >= 0);
-        assert_se(manager_get_route_table_to_string(manager, number, /* append_num = */ true, &str) >= 0);
-        assert_se(streq(str, expected));
+        ASSERT_OK(asprintf(&expected, "%s(%" PRIu32 ")", name, number));
+        ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ true, &str));
+        ASSERT_STREQ(str, expected);
 
         str = mfree(str);
 
-        assert_se(manager_get_route_table_to_string(manager, number, /* append_num = */ false, &str) >= 0);
-        assert_se(streq(str, name));
+        ASSERT_OK(manager_get_route_table_to_string(manager, number, /* append_num = */ false, &str));
+        ASSERT_STREQ(str, name);
 
-        assert_se(manager_get_route_table_from_string(manager, name, &t) >= 0);
-        assert_se(t == number);
+        ASSERT_OK(manager_get_route_table_from_string(manager, name, &t));
+        ASSERT_EQ(t, number);
 
-        assert_se(asprintf(&num_str, "%" PRIu32, number) >= 0);
-        assert_se(manager_get_route_table_from_string(manager, num_str, &t) >= 0);
-        assert_se(t == number);
+        ASSERT_OK(asprintf(&num_str, "%" PRIu32, number));
+        ASSERT_OK(manager_get_route_table_from_string(manager, num_str, &t));
+        ASSERT_EQ(t, number);
 }
 
-static void test_route_tables(Manager *manager) {
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "hoge:123 foo:456 aaa:111", manager, manager) >= 0);
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "bbb:11111 ccc:22222", manager, manager) >= 0);
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "ddd:22222", manager, manager) >= 0);
+TEST(route_tables) {
+        _cleanup_(manager_freep) Manager *manager = NULL;
+
+        ASSERT_OK(manager_new(&manager, /* test_mode = */ true));
+        ASSERT_OK(manager_setup(manager));
+
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "hoge:123 foo:456 aaa:111", manager, manager));
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "bbb:11111 ccc:22222", manager, manager));
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "ddd:22222", manager, manager));
 
         test_route_tables_one(manager, "hoge", 123);
         test_route_tables_one(manager, "foo", 456);
@@ -137,110 +129,68 @@ static void test_route_tables(Manager *manager) {
         test_route_tables_one(manager, "bbb", 11111);
         test_route_tables_one(manager, "ccc", 22222);
 
-        assert_se(!hashmap_get(manager->route_table_numbers_by_name, "ddd"));
+        ASSERT_NULL(hashmap_get(manager->route_table_numbers_by_name, "ddd"));
 
         test_route_tables_one(manager, "default", 253);
         test_route_tables_one(manager, "main", 254);
         test_route_tables_one(manager, "local", 255);
 
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "", manager, manager) >= 0);
-        assert_se(!manager->route_table_names_by_number);
-        assert_se(!manager->route_table_numbers_by_name);
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "", manager, manager));
+        ASSERT_NULL(manager->route_table_names_by_number);
+        ASSERT_NULL(manager->route_table_numbers_by_name);
 
         /* Invalid pairs */
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager) >= 0);
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "xxx:253 yyy:254 local:255", manager, manager) >= 0);
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager) >= 0);
-        assert_se(!manager->route_table_names_by_number);
-        assert_se(!manager->route_table_numbers_by_name);
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager));
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "xxx:253 yyy:254 local:255", manager, manager));
+        ASSERT_OK(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager));
+        ASSERT_NULL(manager->route_table_names_by_number);
+        ASSERT_NULL(manager->route_table_numbers_by_name);
 
         test_route_tables_one(manager, "default", 253);
         test_route_tables_one(manager, "main", 254);
         test_route_tables_one(manager, "local", 255);
 }
 
-static int test_load_config(Manager *manager) {
-        int r;
-/*  TODO: should_reload, is false if the config dirs do not exist, so
- *        so we can't do this test here, move it to a test for paths_check_timestamps
- *        directly
- *
- *        assert_se(network_should_reload(manager) == true);
-*/
-
-        r = manager_load_config(manager);
-        if (r == -EPERM)
-                return r;
-        assert_se(r >= 0);
-
-        return 0;
-}
-
-static void test_dhcp_hostname_shorten_overlong(void) {
-        int r;
-
-        {
-                /* simple hostname, no actions, no errors */
-                _cleanup_free_ char *shortened = NULL;
-                r = shorten_overlong("name1", &shortened);
-                assert_se(r == 0);
-                assert_se(streq("name1", shortened));
-        }
-
-        {
-                /* simple fqdn, no actions, no errors */
-                _cleanup_free_ char *shortened = NULL;
-                r = shorten_overlong("name1.example.com", &shortened);
-                assert_se(r == 0);
-                assert_se(streq("name1.example.com", shortened));
-        }
-
-        {
-                /* overlong fqdn, cut to first dot, no errors */
-                _cleanup_free_ char *shortened = NULL;
-                r = shorten_overlong("name1.test-dhcp-this-one-here-is-a-very-very-long-domain.example.com", &shortened);
-                assert_se(r == 1);
-                assert_se(streq("name1", shortened));
-        }
-
-        {
-                /* overlong hostname, cut to HOST_MAX_LEN, no errors */
-                _cleanup_free_ char *shortened = NULL;
-                r = shorten_overlong("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-domainname", &shortened);
-                assert_se(r == 1);
-                assert_se(streq("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-dom", shortened));
-        }
-
-        {
-                /* overlong fqdn, cut to first dot, empty result error */
-                _cleanup_free_ char *shortened = NULL;
-                r = shorten_overlong(".test-dhcp-this-one-here-is-a-very-very-long-hostname.example.com", &shortened);
-                assert_se(r == -EDOM);
-                assert_se(shortened == NULL);
-        }
-}
-
-int main(void) {
+TEST(manager_enumerate) {
         _cleanup_(manager_freep) Manager *manager = NULL;
-        int r;
 
-        test_setup_logging(LOG_INFO);
+        ASSERT_OK(manager_new(&manager, /* test_mode = */ true));
+        ASSERT_OK(manager_setup(manager));
 
-        test_deserialize_in_addr();
-        test_deserialize_dhcp_routes();
-        test_dhcp_hostname_shorten_overlong();
+        /* TODO: should_reload, is false if the config dirs do not exist, so we can't do this test here, move
+         * it to a test for paths_check_timestamps directly. */
+        if (ASSERT_OK_OR(manager_load_config(manager), -EPERM) < 0)
+                return (void) log_tests_skipped("Cannot load configuration files");
 
-        assert_se(manager_new(&manager, /* test_mode = */ true) >= 0);
-        assert_se(manager_setup(manager) >= 0);
-
-        test_route_tables(manager);
-
-        r = test_load_config(manager);
-        if (r == -EPERM)
-                log_debug("Cannot load configuration, ignoring.");
-        else
-                assert_se(r == 0);
-
-        assert_se(manager_enumerate(manager) >= 0);
-        return 0;
+        ASSERT_OK(manager_enumerate(manager));
 }
+
+TEST(dhcp_hostname_shorten_overlong) {
+        _cleanup_free_ char *s = NULL;
+
+        /* simple hostname, no actions, no errors */
+        ASSERT_OK_ZERO(shorten_overlong("name1", &s));
+        ASSERT_STREQ(s, "name1");
+        s = mfree(s);
+
+        /* simple fqdn, no actions, no errors */
+        ASSERT_OK_ZERO(shorten_overlong("name1.example.com", &s));
+        ASSERT_STREQ(s, "name1.example.com");
+        s = mfree(s);
+
+        /* overlong fqdn, cut to first dot, no errors */
+        ASSERT_OK_POSITIVE(shorten_overlong("name1.test-dhcp-this-one-here-is-a-very-very-long-domain.example.com", &s));
+        ASSERT_STREQ(s, "name1");
+        s = mfree(s);
+
+        /* overlong hostname, cut to HOST_MAX_LEN, no errors */
+        ASSERT_OK_POSITIVE(shorten_overlong("test-dhcp-this-one-here-is-a-very-very-long-hostname-without-domainname", &s));
+        ASSERT_STREQ(s, "test-dhcp-this-one-here-is-a-very-very-long-hostname-without-dom");
+        s = mfree(s);
+
+        /* overlong fqdn, cut to first dot, empty result error */
+        ASSERT_ERROR(shorten_overlong(".test-dhcp-this-one-here-is-a-very-very-long-hostname.example.com", &s), EDOM);
+        ASSERT_NULL(s);
+}
+
+DEFINE_TEST_MAIN(LOG_INFO);

src/resolve/resolved-hook.c

@@ -299,7 +299,7 @@ static void hook_recycle_varlink(Hook *h, sd_varlink *vl) {
 
         /* Disable any potential callbacks while we are recycling the thing */
         sd_varlink_set_userdata(vl, NULL);
-        sd_varlink_bind_reply(vl, NULL);
+        (void) sd_varlink_bind_reply(vl, NULL);
 
         if (set_size(h->idle_links) > HOOK_IDLE_CONNECTIONS_MAX)
                 return;

src/test/test-chase.c

@@ -433,12 +433,12 @@ TEST(chase) {
 
         r = chase(p, NULL, CHASE_STEP, &result, NULL);
         assert_se(r == 0);
-        ASSERT_STREQ("/usr", result);
+        ASSERT_STREQ(result, "/usr");
         result = mfree(result);
 
         r = chase("/usr", NULL, CHASE_STEP, &result, NULL);
         assert_se(r > 0);
-        ASSERT_STREQ("/usr", result);
+        ASSERT_STREQ(result, "/usr");
         result = mfree(result);
 
         /* Make sure that symlinks in the "root" path are not resolved, but those below are */