From: Serge <serge-name@users.noreply.github.com>
Date: Sat, 16 Nov 2019 12:22:35 +0000 (+0300)
Subject: sd-dhcp-client: anonymize DHCPDISCOVER (fixes #13992)
X-Git-Tag: v244-rc1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf9012bbf6d8c8828357a8479080339a2b6b5451;p=thirdparty%2Fsystemd.git

sd-dhcp-client: anonymize DHCPDISCOVER (fixes #13992)

According to RFC7844 section 3 the DHCPDISCOVER message should not contain option 50 («Requested IP Address») when Anonymize is true
---

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index ef330fe28eb..f03989a5a7e 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -875,7 +875,9 @@ static int client_send_discover(sd_dhcp_client *client) {
            address be assigned, and may include the ’IP address lease time’
            option to suggest the lease time it would like.
          */
-        if (client->last_addr != INADDR_ANY) {
+        /* RFC7844 section 3:
+           SHOULD NOT contain any other option. */
+        if (!client->anonymize && client->last_addr != INADDR_ANY) {
                 r = dhcp_option_append(&discover->dhcp, optlen, &optoffset, 0,
                                        SD_DHCP_OPTION_REQUESTED_IP_ADDRESS,
                                        4, &client->last_addr);