From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 13 May 2024 13:02:37 +0000 (-0600)
Subject: machined: use bus_message_read_id128() at one more place
X-Git-Tag: v257-rc1~1141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db747b0dd164f0d4f48c44402e33496c1096f59;p=thirdparty%2Fsystemd.git

machined: use bus_message_read_id128() at one more place
---

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index da64095d372..a66e00edb5a 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -231,9 +231,8 @@ static int method_create_or_register_machine(
         MachineClass c;
         uint32_t leader;
         sd_id128_t id;
-        const void *v;
         Machine *m;
-        size_t n, n_netif = 0;
+        size_t n_netif = 0;
         int r;
 
         assert(manager);
@@ -246,14 +245,8 @@ static int method_create_or_register_machine(
         if (!hostname_is_valid(name, 0))
                 return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid machine name");
 
-        r = sd_bus_message_read_array(message, 'y', &v, &n);
+        r = bus_message_read_id128(message, &id);
         if (r < 0)
-                return r;
-        if (n == 0)
-                id = SD_ID128_NULL;
-        else if (n == 16)
-                memcpy(&id, v, n);
-        else
                 return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid machine ID parameter");
 
         r = sd_bus_message_read(message, "ssus", &service, &class, &leader, &root_directory);