commit 44937b1adbe49f0876492f566b3cc7e0c71ea4ad
author William A. Kennington III <wak@google.com> Wed Apr 17 00:28:20 2024 -0700
committer William A. Kennington III <wak@google.com> Wed Apr 17 02:11:48 2024 -0700
tree 693582a49836d2c69344f63f3b2761ca81306f03
parent f179e70c5c079f480da9a4b70a84ae69b1bcc0db

dhcp_configuration: SendHostname is valid for v4 and v6

We should present this option for both DHCP types as systemd supports it
for both. It would be surprising to an end user if DHCPv6 just ate this
option without passing it along.

Change-Id: I7ae046c0a92ab199e2026ffe3dfb78b8763223a0
Signed-off-by: William A. Kennington III <wak@google.com>

src/dhcp_configuration.cpp

diff --git a/src/dhcp_configuration.cpp b/src/dhcp_configuration.cpp
index 149dd60..1e4e999 100644
--- a/src/dhcp_configuration.cpp
+++ b/src/dhcp_configuration.cpp
@@ -53,11 +53,8 @@
     ConfigIntf::dnsEnabled(getDHCPProp(conf, type, "UseDNS"), true);
     ConfigIntf::ntpEnabled(getDHCPProp(conf, type, "UseNTP"), true);
     ConfigIntf::hostNameEnabled(getDHCPProp(conf, type, "UseHostname"), true);
-    if (type == DHCPType::v4)
-    {
-        ConfigIntf::sendHostNameEnabled(getDHCPProp(conf, type, "SendHostname"),
-                                        true);
-    }
+    ConfigIntf::sendHostNameEnabled(getDHCPProp(conf, type, "SendHostname"),
+                                    true);
 
     emit_object_added();
 }

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index 5aae789..f49cb24 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -775,6 +775,8 @@
         dhcp6["UseDomains"].emplace_back(tfStr(dhcp6Conf->domainEnabled()));
         dhcp6["UseNTP"].emplace_back(tfStr(dhcp6Conf->ntpEnabled()));
         dhcp6["UseHostname"].emplace_back(tfStr(dhcp6Conf->hostNameEnabled()));
+        dhcp6["SendHostname"].emplace_back(
+            tfStr(dhcp6Conf->sendHostNameEnabled()));
     }
     auto path = config::pathForIntfConf(manager.get().getConfDir(),
                                         interfaceName());