From f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 5 Dec 2013 15:11:15 +0000 Subject: [settings] Merge SETTING_IPv4 and SETTING_IPv6 Allow for equivalent IPv4 and IPv6 settings (which requires equivalent settings to be adjacent within the settings list). Signed-off-by: Michael Brown --- src/core/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/settings.c b/src/core/settings.c index 1f99bca89..1f7425482 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -2346,7 +2346,7 @@ const struct setting hostname_setting __setting ( SETTING_HOST, hostname ) = { }; /** Domain name setting */ -const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA, domain ) = { +const struct setting domain_setting __setting ( SETTING_IP_EXTRA, domain ) = { .name = "domain", .description = "DNS domain", .tag = DHCP_DOMAIN_NAME, -- cgit v1.2.3-55-g7522