summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-03-07 11:17:05 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-03-10 06:47:28 +0100
commit3d80c57b7ee76505f08532e31e847c909ff7cee5 (patch)
tree317635fb1099aa87482164a9a0a13b523abd4f97 /src
parentdhcp: list all known DHCP options (diff)
downloadsystemd-3d80c57b7ee76505f08532e31e847c909ff7cee5.tar.xz
systemd-3d80c57b7ee76505f08532e31e847c909ff7cee5.zip
sd-dhcp6-client: rename timezone options
To make them follow corresponding DHCPv4 options.
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-network/dhcp6-option.c4
-rw-r--r--src/systemd/sd-dhcp6-client.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index d25377d377..735fd2cde2 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -72,8 +72,8 @@ bool dhcp6_option_can_request(uint16_t option) {
return false;
case SD_DHCP6_OPTION_CLIENT_FQDN:
case SD_DHCP6_OPTION_PANA_AGENT:
- case SD_DHCP6_OPTION_NEW_POSIX_TIMEZONE:
- case SD_DHCP6_OPTION_NEW_TZDB_TIMEZONE:
+ case SD_DHCP6_OPTION_POSIX_TIMEZONE:
+ case SD_DHCP6_OPTION_TZDB_TIMEZONE:
return true;
case SD_DHCP6_OPTION_ERO:
case SD_DHCP6_OPTION_LQ_QUERY:
diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h
index 1bb21e0255..d89b7d1c83 100644
--- a/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/sd-dhcp6-client.h
@@ -81,8 +81,8 @@ enum {
SD_DHCP6_OPTION_SUBSCRIBER_ID = 38, /* RFC 4580 */
SD_DHCP6_OPTION_CLIENT_FQDN = 39, /* RFC 4704 */
SD_DHCP6_OPTION_PANA_AGENT = 40, /* RFC 5192 */
- SD_DHCP6_OPTION_NEW_POSIX_TIMEZONE = 41, /* RFC 4833 */
- SD_DHCP6_OPTION_NEW_TZDB_TIMEZONE = 42, /* RFC 4833 */
+ SD_DHCP6_OPTION_POSIX_TIMEZONE = 41, /* RFC 4833 */
+ SD_DHCP6_OPTION_TZDB_TIMEZONE = 42, /* RFC 4833 */
SD_DHCP6_OPTION_ERO = 43, /* RFC 4994 */
SD_DHCP6_OPTION_LQ_QUERY = 44, /* RFC 5007 */
SD_DHCP6_OPTION_CLIENT_DATA = 45, /* RFC 5007 */