SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

machined: use bus_message_read_id128() at one more place

Browse Source
This commit is contained in:
Lennart Poettering
2024-06-15 01:19:31 +01:00
committed by Luca Boccassi
parent 05e69717fa
commit 4db747b0dd
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machined-dbus.c
+2 -9
View File
@@ -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);