]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
hostnamed: always include VSockCID property in describe JSON 30833/head
authorLennart Poettering <lennart@poettering.net>
Mon, 8 Jan 2024 15:45:07 +0000 (16:45 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 9 Jan 2024 09:46:25 +0000 (10:46 +0100)
that way clients can distinguish whether there is no cid or whether
hostnamed doesn't support it nicely, by just looking if the prop exists
(but is null) or not.

This is similar how we already handle all other props in the JSON
record.

src/hostname/hostnamed.c

index f24c126d5d647246a389a142dc6e9eecdfff96f1..f01d771f9bc1e28adcf182d2bcd7ac9902dadcfb 100644 (file)
@@ -1444,7 +1444,8 @@ static int build_describe_response(Context *c, bool privileged, JsonVariant **re
                                        JSON_BUILD_PAIR_ID128("BootID", boot_id),
                                        JSON_BUILD_PAIR_CONDITION(!sd_id128_is_null(product_uuid), "ProductUUID", JSON_BUILD_ID128(product_uuid)),
                                        JSON_BUILD_PAIR_CONDITION(sd_id128_is_null(product_uuid), "ProductUUID", JSON_BUILD_NULL),
-                                       JSON_BUILD_PAIR_CONDITION(local_cid != VMADDR_CID_ANY, "VSockCID", JSON_BUILD_UNSIGNED(local_cid))));
+                                       JSON_BUILD_PAIR_CONDITION(local_cid != VMADDR_CID_ANY, "VSockCID", JSON_BUILD_UNSIGNED(local_cid)),
+                                       JSON_BUILD_PAIR_CONDITION(local_cid == VMADDR_CID_ANY, "VSockCID", JSON_BUILD_NULL)));
         if (r < 0)
                 return log_error_errno(r, "Failed to build JSON data: %m");