config/trivial: unify name of compile time config defaults

6 files changed, 18 insertions, 18 deletions

diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 6cb5c105b9..bce24a87f3 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -359,13 +359,13 @@ nm_dhcp_manager_init (NMDhcpManager *self)
 				nm_log_warn (LOGD_DHCP, "dhcp-init: DHCP client '%s' not available", client);
 		}
 		if (!client_factory) {
-			client_factory = _client_factory_find_by_name (""NM_CONFIG_DEFAULT_DHCP);
+			client_factory = _client_factory_find_by_name (""NM_CONFIG_DEFAULT_MAIN_DHCP);
 			if (!client_factory)
-				nm_log_err (LOGD_DHCP, "dhcp-init: default DHCP client '%s' is not installed", NM_CONFIG_DEFAULT_DHCP);
+				nm_log_err (LOGD_DHCP, "dhcp-init: default DHCP client '%s' is not installed", NM_CONFIG_DEFAULT_MAIN_DHCP);
 			else {
 				client_factory = _client_factory_available (client_factory);
 				if (!client_factory)
-					nm_log_info (LOGD_DHCP, "dhcp-init: default DHCP client '%s' is not available", NM_CONFIG_DEFAULT_DHCP);
+					nm_log_info (LOGD_DHCP, "dhcp-init: default DHCP client '%s' is not available", NM_CONFIG_DEFAULT_MAIN_DHCP);
 			}
 		}
 		if (!client_factory) {
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 33f2074ead..30e448c325 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -1655,9 +1655,9 @@ again:
 		if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN) {
 			if (man) {
 				_LOGW ("init: unknown resolv.conf manager \"%s\", fallback to \"%s\"",
-				       man, ""NM_CONFIG_DEFAULT_DNS_RC_MANAGER);
+				       man, ""NM_CONFIG_DEFAULT_MAIN_RC_MANAGER);
 			}
-			man = ""NM_CONFIG_DEFAULT_DNS_RC_MANAGER;
+			man = ""NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;
 			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
 			goto again;
 		}
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 7c3bebfe93..ece18b5c09 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -232,7 +232,7 @@ nm_config_data_get_plugins (const NMConfigData *self, gboolean allow_default)
 		gs_unref_keyfile GKeyFile *kf = nm_config_create_keyfile ();
 
 		/* let keyfile split the default string according to it's own escaping rules. */
-		g_key_file_set_value (kf, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NM_CONFIG_PLUGINS_DEFAULT);
+		g_key_file_set_value (kf, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NM_CONFIG_DEFAULT_MAIN_PLUGINS);
 		list = g_key_file_get_string_list (kf, NM_CONFIG_KEYFILE_GROUP_MAIN, "plugins", NULL, NULL);
 	}
 	return _nm_utils_strv_cleanup (list, TRUE, TRUE, TRUE);
@@ -566,11 +566,11 @@ static struct {
 	const char *key;
 	const char *value;
 } default_values[] = {
-	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "plugins",      NM_CONFIG_PLUGINS_DEFAULT },
-	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "rc-manager",   NM_CONFIG_DEFAULT_DNS_RC_MANAGER },
-	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "auth-polkit",  NM_CONFIG_DEFAULT_AUTH_POLKIT },
-	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "dhcp",         NM_CONFIG_DEFAULT_DHCP },
-	{ NM_CONFIG_KEYFILE_GROUP_LOGGING,  "backend",      NM_CONFIG_LOGGING_BACKEND_DEFAULT },
+	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "plugins",      NM_CONFIG_DEFAULT_MAIN_PLUGINS },
+	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "rc-manager",   NM_CONFIG_DEFAULT_MAIN_RC_MANAGER },
+	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "auth-polkit",  NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT },
+	{ NM_CONFIG_KEYFILE_GROUP_MAIN,     "dhcp",         NM_CONFIG_DEFAULT_MAIN_DHCP },
+	{ NM_CONFIG_KEYFILE_GROUP_LOGGING,  "backend",      NM_CONFIG_DEFAULT_LOGGING_BACKEND },
 	{ NM_CONFIG_KEYFILE_GROUP_LOGGING,  "audit",        NM_CONFIG_DEFAULT_LOGGING_AUDIT },
 };
 
diff --git a/src/nm-config.c b/src/nm-config.c
index 03aa6d4b64..ebc934092f 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -270,7 +270,7 @@ nm_config_get_monitor_connection_files (NMConfig *config)
 gboolean
 nm_config_get_auth_polkit (NMConfig *config)
 {
-	g_return_val_if_fail (NM_IS_CONFIG (config), NM_CONFIG_DEFAULT_AUTH_POLKIT_BOOL);
+	g_return_val_if_fail (NM_IS_CONFIG (config), NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL);
 
 	return NM_CONFIG_GET_PRIVATE (config)->auth_polkit;
 }
@@ -497,7 +497,7 @@ nm_config_cmd_line_options_add_to_entries (NMConfigCmdLineOptions *cli,
 			{ "intern-config", 0, 0, G_OPTION_ARG_FILENAME, &cli->intern_config_file, N_("Internal config file location"), N_(DEFAULT_INTERN_CONFIG_FILE) },
 			{ "state-file", 0, 0, G_OPTION_ARG_FILENAME, &cli->state_file, N_("State file location"), N_(DEFAULT_STATE_FILE) },
 			{ "no-auto-default", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &cli->no_auto_default_file, N_("State file for no-auto-default devices"), N_(DEFAULT_NO_AUTO_DEFAULT_FILE) },
-			{ "plugins", 0, 0, G_OPTION_ARG_STRING, &cli->plugins, N_("List of plugins separated by ','"), N_(NM_CONFIG_PLUGINS_DEFAULT) },
+			{ "plugins", 0, 0, G_OPTION_ARG_STRING, &cli->plugins, N_("List of plugins separated by ','"), N_(NM_CONFIG_DEFAULT_MAIN_PLUGINS) },
 			{ "configure-and-quit", 0, 0, G_OPTION_ARG_NONE, &cli->configure_and_quit, N_("Quit after initial configuration"), NULL },
 			{ "debug", 'd', 0, G_OPTION_ARG_NONE, &cli->is_debug, N_("Don't become a daemon, and log to stderr"), NULL },
 
@@ -758,7 +758,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config, const char *dirname, co
 						if (!old_val && !g_key_file_has_key (keyfile, group, base_key, NULL)) {
 							/* we must fill the unspecified value with the compile-time default. */
 							if (nm_streq (group, NM_CONFIG_KEYFILE_GROUP_MAIN) && nm_streq (base_key, "plugins")) {
-								g_key_file_set_value (keyfile, group, base_key, NM_CONFIG_PLUGINS_DEFAULT);
+								g_key_file_set_value (keyfile, group, base_key, NM_CONFIG_DEFAULT_MAIN_PLUGINS);
 								old_val = g_key_file_get_string_list (keyfile, group, base_key, NULL, NULL);
 							}
 						}
@@ -2331,7 +2331,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 
 	priv->monitor_connection_files = nm_config_keyfile_get_boolean (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "monitor-connection-files", FALSE);
 
-	priv->auth_polkit = nm_config_keyfile_get_boolean (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "auth-polkit", NM_CONFIG_DEFAULT_AUTH_POLKIT_BOOL);
+	priv->auth_polkit = nm_config_keyfile_get_boolean (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "auth-polkit", NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL);
 
 	priv->dhcp_client = nm_strstrip (g_key_file_get_string (keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "dhcp", NULL));
 
@@ -2372,7 +2372,7 @@ nm_config_init (NMConfig *config)
 {
 	NMConfigPrivate *priv = NM_CONFIG_GET_PRIVATE (config);
 
-	priv->auth_polkit = NM_CONFIG_DEFAULT_AUTH_POLKIT_BOOL;
+	priv->auth_polkit = NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL;
 }
 
 NMConfig *
diff --git a/src/nm-config.h b/src/nm-config.h
index 15c46ed547..fbeb7bd9fd 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -182,7 +182,7 @@ extern char *_nm_config_match_env;
 
 #define NM_CONFIG_DEVICE_STATE_DIR ""NMRUNDIR"/devices"
 
-#define NM_CONFIG_DEFAULT_AUTH_POLKIT_BOOL          (nm_streq (""NM_CONFIG_DEFAULT_AUTH_POLKIT, "true"))
+#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL     (nm_streq (""NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "true"))
 #define NM_CONFIG_DEFAULT_LOGGING_AUDIT_BOOL        (nm_streq (""NM_CONFIG_DEFAULT_LOGGING_AUDIT, "true"))
 
 typedef enum {
diff --git a/src/nm-logging.c b/src/nm-logging.c
index f8ecf0c94b..50927f8caf 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -818,7 +818,7 @@ nm_logging_syslog_openlog (const char *logging_backend)
 		g_return_if_reached ();
 
 	if (!logging_backend)
-		logging_backend = ""NM_CONFIG_LOGGING_BACKEND_DEFAULT;
+		logging_backend = ""NM_CONFIG_DEFAULT_LOGGING_BACKEND;
 
 	if (strcmp (logging_backend, "debug") == 0) {
 		global.log_backend = LOG_BACKEND_SYSLOG;