From 665eff90e5908188906f7d8b55bfe4eba28eaff2 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Fri, 10 Aug 2012 11:21:26 +0300 Subject: dhcp: Apply received hostname option according to conf file setting We do not use the received DHCP hostname option (12) if system config file setting says so. Fixes BMC#25597 --- src/dhcp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/dhcp.c') diff --git a/src/dhcp.c b/src/dhcp.c index 3425b6d1..9d1a95e1 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -28,6 +28,7 @@ #include #include +#include #include @@ -258,9 +259,12 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) if (option != NULL) domainname = g_strdup(option->data); - option = g_dhcp_client_get_option(dhcp_client, G_DHCP_HOST_NAME); - if (option != NULL) - hostname = g_strdup(option->data); + if (connman_setting_get_bool("AllowHostnameUpdates") == TRUE) { + option = g_dhcp_client_get_option(dhcp_client, + G_DHCP_HOST_NAME); + if (option != NULL) + hostname = g_strdup(option->data); + } option = g_dhcp_client_get_option(dhcp_client, G_DHCP_NTP_SERVER); ns_entries = g_list_length(option); -- cgit v1.2.3