From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 11 Dec 2023 15:16:02 +0000 (+0100)
Subject: network: actually show the unexpected flags
X-Git-Tag: v256-rc1~1517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7d435925dd81e7ab505c41692140c7a3ad2f73e;p=thirdparty%2Fsystemd.git

network: actually show the unexpected flags

The original version would yield a slightly _unexpected_ message for
this [Address] section:

[Address]
Address=10.9.3.1/24
HomeAddress=yes
ManageTemporaryAddress=yes

systemd-networkd[68396]: /run/systemd/network/25-address-static.network: unexpected address flags "n/a" were configured. Ignoring [Address] section from line 144.

Let's instead show the unexpected flags:

systemd-networkd[69160]: /run/systemd/network/25-address-static.network: unexpected address flags "home-address,manage-temporary-address" were configured. Ignoring [Address] section from line 144.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index c0dff888e09..124f0e08044 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -2472,7 +2472,7 @@ int address_section_verify(Address *address) {
         if (address->flags != filtered_flags) {
                 _cleanup_free_ char *str = NULL;
 
-                (void) address_flags_to_string_alloc(filtered_flags, address->family, &str);
+                (void) address_flags_to_string_alloc(address->flags ^ filtered_flags, address->family, &str);
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
                                          "%s: unexpected address flags \"%s\" were configured. "
                                          "Ignoring [Address] section from line %u.",