summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-06-11 21:36:40 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-06-12 11:20:05 +0200
commit8598b77d00f36b2b63d14ebd4cd9e92dc8919135 (patch)
treec18b8b1e021dec3c4b4358737fea9b846ea69ef6
parent9d16ed36bbf5cb80aaf4613cffd9b63e493e1859 (diff)
downloadNetworkManager-bg/hostname-bgo740409.tar.gz
fixup! settings: remove hostname handling from pluginsbg/hostname-bgo740409
-rw-r--r--src/settings/plugins/keyfile/plugin.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 47135fa42c..ee7da79630 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -639,12 +639,19 @@ nm_settings_keyfile_plugin_new (void)
{
static SCPluginKeyfile *singleton = NULL;
SCPluginKeyfilePrivate *priv;
+ char *value;
if (!singleton) {
singleton = SC_PLUGIN_KEYFILE (g_object_new (SC_TYPE_PLUGIN_KEYFILE, NULL));
priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (singleton);
priv->config = g_object_ref (nm_config_get ());
+ value = nm_config_data_get_value (nm_config_get_data (priv->config),
+ "keyfile", "hostname", NULL);
+ if (value) {
+ nm_log_warn (LOGD_SETTINGS, "keyfile: 'hostname' option is deprecated and has no effect");
+ g_free (value);
+ }
} else
g_object_ref (singleton);