From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 30 Jan 2023 09:55:10 +0000 (+0900)
Subject: network: dhcp-server: do not create DHCPServer object when the DHCP server is running... 
X-Git-Tag: v253-rc2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cb1cabb412850e88eaf26feec663674e2c4f664;p=thirdparty%2Fsystemd.git

network: dhcp-server: do not create DHCPServer object when the DHCP server is running in relaying mode

Follow-up for c95df5879eeb2cec8bc8eec2cfa7e741e1d9469f.

Fixes #26196.
---

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 193d1d3e1eb..e9c18f0fd01 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -858,7 +858,8 @@ int link_object_find(sd_bus *bus, const char *path, const char *interface, void
         if (r < 0)
                 return 0;
 
-        if (streq(interface, "org.freedesktop.network1.DHCPServer") && !link->dhcp_server)
+        if (streq(interface, "org.freedesktop.network1.DHCPServer") &&
+            (!link->dhcp_server || sd_dhcp_server_is_in_relay_mode(link->dhcp_server)))
                 return 0;
 
         *found = link;