From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Fri, 10 Aug 2012 08:21:25 +0000 (+0300)
Subject: main: Introduce conf file option to disable hostname updates
X-Git-Tag: 1.5~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8042d16be5b0f4556f502be949271d14903e7a7d;p=platform%2Fupstream%2Fconnman.git

main: Introduce conf file option to disable hostname updates

The AllowHostnameUpdates in system config file can be used
to ignore the hostname update request that for example
can be received via DHCP hostname option.
---

diff --git a/src/main.c b/src/main.c
index 1e4809f6..62e5c54d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,7 @@ static struct {
 	unsigned int timeout_inputreq;
 	unsigned int timeout_browserlaunch;
 	char **blacklisted_interfaces;
+	connman_bool_t allow_hostname_updates;
 } connman_settings  = {
 	.bg_scan = TRUE,
 	.pref_timeservers = NULL,
@@ -76,6 +77,7 @@ static struct {
 	.timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT,
 	.timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT,
 	.blacklisted_interfaces = NULL,
+	.allow_hostname_updates = TRUE,
 };
 
 static GKeyFile *load_config(const char *file)
@@ -243,6 +245,14 @@ static void parse_config(GKeyFile *config)
 			g_strdupv(default_blacklist);
 
 	g_clear_error(&error);
+
+	boolean = g_key_file_get_boolean(config, "General",
+					"AllowHostnameUpdates",
+					&error);
+	if (error == NULL)
+		connman_settings.allow_hostname_updates = boolean;
+
+	g_clear_error(&error);
 }
 
 static int config_init(const char *file)
@@ -403,6 +413,9 @@ connman_bool_t connman_setting_get_bool(const char *key)
 	if (g_str_equal(key, "BackgroundScanning") == TRUE)
 		return connman_settings.bg_scan;
 
+	if (g_str_equal(key, "AllowHostnameUpdates") == TRUE)
+		return connman_settings.allow_hostname_updates;
+
 	return FALSE;
 }
 
diff --git a/src/main.conf b/src/main.conf
index 95fc7d44..67275dab 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -58,3 +58,8 @@
 # match any of the list entries. Default value is
 # vmnet,vboxnet,virbr.
 # NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
+
+# Allow connman to change the system hostname. This can
+# happen for example if we receive DHCP hostname option.
+# Default value is true.
+# AllowHostnameUpdates = true