From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Thu, 4 Jan 2018 13:11:48 +0000 (+0200)
Subject: dhcp6: Ensure IAID is applied to both IA NA and IA PD
X-Git-Tag: v237~103^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69b4399748297a2a812e5f8e5d2d786b3b1d1a96;p=thirdparty%2Fsystemd.git

dhcp6: Ensure IAID is applied to both IA NA and IA PD

Update the code to set IAID for both IA NA and IA PD options.
---

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 6efe1a72835..9586da65034 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -709,16 +709,20 @@ error:
 
 static int client_ensure_iaid(sd_dhcp6_client *client) {
         int r;
+        be32_t iaid;
 
         assert(client);
 
         if (client->ia_na.ia_na.id)
                 return 0;
 
-        r = dhcp_identifier_set_iaid(client->ifindex, client->mac_addr, client->mac_addr_len, &client->ia_na.ia_na.id);
+        r = dhcp_identifier_set_iaid(client->ifindex, client->mac_addr, client->mac_addr_len, &iaid);
         if (r < 0)
                 return r;
 
+        client->ia_na.ia_na.id = iaid;
+        client->ia_pd.ia_pd.id = iaid;
+
         return 0;
 }