summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-12-13 09:08:34 +0100
committerThomas Haller <thaller@redhat.com>2022-12-19 11:29:11 +0100
commit9073628bd61a71ada5d87cfc0304c28d0bdc4291 (patch)
treef7aab9c9637691f000e4913a97e7b96af2557a29
parent191a1c74bf19cd00c7f630a0bcdd47a15ad68829 (diff)
downloadNetworkManager-9073628bd61a71ada5d87cfc0304c28d0bdc4291.tar.gz
dhcp/trivial: fix naming for internal NM_DHCP_OPTION_DHCP6_{CLIENT,SERVER}_ID enums
-rw-r--r--src/core/dhcp/nm-dhcp-options.c4
-rw-r--r--src/core/dhcp/nm-dhcp-options.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c
index 5c4a821298..9831765601 100644
--- a/src/core/dhcp/nm-dhcp-options.c
+++ b/src/core/dhcp/nm-dhcp-options.c
@@ -190,12 +190,12 @@ static const NMDhcpOption *const _sorted_options_4[G_N_ELEMENTS(_nm_dhcp_option_
};
const NMDhcpOption _nm_dhcp_option_dhcp6_options[] = {
- REQ(NM_DHCP_OPTION_DHCP6_CLIENTID, "dhcp6_client_id", FALSE),
+ REQ(NM_DHCP_OPTION_DHCP6_CLIENT_ID, "dhcp6_client_id", FALSE),
/* Don't request server ID by default; some servers don't reply to
* Information Requests that request the Server ID.
*/
- REQ(NM_DHCP_OPTION_DHCP6_SERVERID, "dhcp6_server_id", FALSE),
+ REQ(NM_DHCP_OPTION_DHCP6_SERVER_ID, "dhcp6_server_id", FALSE),
REQ(NM_DHCP_OPTION_DHCP6_DNS_SERVERS, "dhcp6_name_servers", TRUE),
REQ(NM_DHCP_OPTION_DHCP6_DOMAIN_LIST, "dhcp6_domain_search", TRUE),
diff --git a/src/core/dhcp/nm-dhcp-options.h b/src/core/dhcp/nm-dhcp-options.h
index 4c978c4f97..bdad8c94e8 100644
--- a/src/core/dhcp/nm-dhcp-options.h
+++ b/src/core/dhcp/nm-dhcp-options.h
@@ -157,8 +157,8 @@ typedef enum {
} NMDhcpOptionDhcp4Options;
typedef enum {
- NM_DHCP_OPTION_DHCP6_CLIENTID = 1,
- NM_DHCP_OPTION_DHCP6_SERVERID = 2,
+ NM_DHCP_OPTION_DHCP6_CLIENT_ID = 1,
+ NM_DHCP_OPTION_DHCP6_SERVER_ID = 2,
NM_DHCP_OPTION_DHCP6_DNS_SERVERS = 23,
NM_DHCP_OPTION_DHCP6_DOMAIN_LIST = 24,
NM_DHCP_OPTION_DHCP6_SNTP_SERVERS = 31,