From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 23 Apr 2025 13:43:43 +0000 (+0200)
Subject: bus-message-util: use bus_message_read_family() at one more place
X-Git-Tag: v258-rc1~745^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=176b887da4450b80287d11ea178635a93d15dc94;p=thirdparty%2Fsystemd.git

bus-message-util: use bus_message_read_family() at one more place
---

diff --git a/src/shared/bus-message-util.c b/src/shared/bus-message-util.c
index 8da112caccb..1b855df2931 100644
--- a/src/shared/bus-message-util.c
+++ b/src/shared/bus-message-util.c
@@ -82,7 +82,7 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error,
 
         assert(message);
 
-        r = sd_bus_message_read(message, "i", &family);
+        r = bus_message_read_family(message, error, &family);
         if (r < 0)
                 return r;
 
@@ -90,9 +90,6 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error,
         if (r < 0)
                 return r;
 
-        if (!IN_SET(family, AF_INET, AF_INET6))
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family);
-
         if (sz != FAMILY_ADDRESS_SIZE(family))
                 return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size");