diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 8 | ||||
| -rw-r--r-- | man/common.ent.in | 8 | ||||
| -rw-r--r-- | src/dhcp/nm-dhcp-manager.c | 6 | ||||
| -rw-r--r-- | src/dns/nm-dns-manager.c | 4 | ||||
| -rw-r--r-- | src/nm-config-data.c | 12 | ||||
| -rw-r--r-- | src/nm-config.c | 10 | ||||
| -rw-r--r-- | src/nm-config.h | 2 | ||||
| -rw-r--r-- | src/nm-logging.c | 2 |
9 files changed, 38 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 29aee7cacc..94b5152ef8 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,7 @@ test "$enable_ifupdown" = "yes" && distro_plugins="$distro_plugins,ifu test "$enable_ifnet" = "yes" && distro_plugins="$distro_plugins,ifnet" distro_plugins="${distro_plugins#,}" -AC_DEFINE_UNQUOTED(NM_CONFIG_PLUGINS_DEFAULT, "$config_plugins_default", [Default configuration option for main.plugins setting]) +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_PLUGINS, "$config_plugins_default", [Default configuration option for main.plugins setting]) if test "${enable_config_plugin_ibft}" = yes; then AC_DEFINE(WITH_SETTINGS_PLUGIN_IBFT, 1, [Whether compilation of ibft setting plugin is enabled]) else @@ -417,9 +417,9 @@ if test "$nm_config_logging_backend_default" = ""; then nm_config_logging_backend_default='syslog' fi fi -AC_DEFINE_UNQUOTED(NM_CONFIG_LOGGING_BACKEND_DEFAULT, "$nm_config_logging_backend_default", [Default configuration option for logging.backend]) -NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT="$nm_config_logging_backend_default" -AC_SUBST(NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT) +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_LOGGING_BACKEND, "$nm_config_logging_backend_default", [Default configuration option for logging.backend]) +NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default" +AC_SUBST(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT) # Session tracking support AC_ARG_WITH(systemd-logind, AS_HELP_STRING([--with-systemd-logind=yes|no], @@ -579,11 +579,11 @@ AC_ARG_ENABLE(polkit, AS_HELP_STRING([--enable-polkit=yes|no|disabled], [set def [enable_polkit=${enableval}], [enable_polkit=yes]) if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); then enable_polkit=yes - AC_DEFINE(NM_CONFIG_DEFAULT_AUTH_POLKIT, "true", [The default value of the auth-polkit configuration option]) - AC_SUBST(NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT, true) + AC_DEFINE(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "true", [The default value of the auth-polkit configuration option]) + AC_SUBST(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT, true) else - AC_DEFINE(NM_CONFIG_DEFAULT_AUTH_POLKIT, "false", [The default value of the auth-polkit configuration option]) - AC_SUBST(NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT, false) + AC_DEFINE(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT, "false", [The default value of the auth-polkit configuration option]) + AC_SUBST(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT, false) fi if (test "${enable_polkit}" != "disabled"); then AC_DEFINE(WITH_POLKIT, 1, [whether to compile polkit support]) @@ -815,8 +815,8 @@ fi test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' test -z "$config_dhcp_default" && config_dhcp_default='internal' -AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_DHCP, "$config_dhcp_default", [Default configuration option for main.dhcp setting]) -AC_SUBST(NM_CONFIG_DEFAULT_DHCP, $config_dhcp_default) +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_DHCP, "$config_dhcp_default", [Default configuration option for main.dhcp setting]) +AC_SUBST(NM_CONFIG_DEFAULT_MAIN_DHCP, $config_dhcp_default) # resolvconf and netconfig support AC_ARG_WITH(resolvconf, AS_HELP_STRING([--with-resolvconf=yes|no|path], [Enable resolvconf support])) @@ -856,8 +856,8 @@ fi if test "$with_netconfig" != "no"; then AC_DEFINE_UNQUOTED(NETCONFIG_PATH, "$with_netconfig", [Path to netconfig]) fi -AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_DNS_RC_MANAGER, "$config_dns_rc_manager_default", [Default value for main.rc-manager setting (--with-config-dns-rc-manager-default)]) -AC_SUBST(NM_CONFIG_DEFAULT_DNS_RC_MANAGER, $config_dns_rc_manager_default) +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER, "$config_dns_rc_manager_default", [Default value for main.rc-manager setting (--with-config-dns-rc-manager-default)]) +AC_SUBST(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER, $config_dns_rc_manager_default) # iptables path AC_ARG_WITH(iptables, AS_HELP_STRING([--with-iptables=/path/to/iptables], [path to iptables])) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index f765ca9461..ae14b05e34 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -176,7 +176,7 @@ plugins-=remove-me <listitem><para>Whether the system uses PolicyKit for authorization. If <literal>false</literal>, all requests will be allowed. If <literal>true</literal>, non-root requests are authorized using PolicyKit. - The default value is <literal>&NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT;</literal>. + The default value is <literal>&NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT;</literal>. </para></listitem> </varlistentry> <varlistentry> @@ -189,7 +189,7 @@ plugins-=remove-me clients to be installed. The <literal>internal</literal> option uses a built-in DHCP client which is not currently as featureful as the external clients.</para> - <para>If this key is missing, it defaults to <literal>&NM_CONFIG_DEFAULT_DHCP;</literal>. + <para>If this key is missing, it defaults to <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal>. It the chosen plugin is not available, clients are looked for in this order: <literal>dhclient</literal>, <literal>dhcpcd</literal>, <literal>internal</literal>.</para></listitem> @@ -319,7 +319,7 @@ no-auto-default=* <listitem><para>Set the <filename>resolv.conf</filename> management mode. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of - "<literal>&NM_CONFIG_DEFAULT_DNS_RC_MANAGER;</literal>". + "<literal>&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;</literal>". Regardless of this setting, NetworkManager will always write resolv.conf to its runtime state directory.</para> <para><literal>symlink</literal>: NetworkManager will symlink @@ -558,7 +558,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth "<literal>debug</literal>" uses syslog and logs to standard error. If NetworkManager is started in debug mode (<literal>--debug</literal>) this option is ignored and "<literal>debug</literal>" is always used. - Otherwise, the default is "<literal>&NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT;</literal>". + Otherwise, the default is "<literal>&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;</literal>". </para></listitem> </varlistentry> <varlistentry> diff --git a/man/common.ent.in b/man/common.ent.in index bb9adad248..4c3310c44b 100644 --- a/man/common.ent.in +++ b/man/common.ent.in @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <!ENTITY NM_VERSION "@NM_VERSION@"> <!ENTITY sysconfdir "@sysconfdir@"> -<!ENTITY NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT "@NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@"> -<!ENTITY NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT "@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@"> +<!ENTITY NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT "@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT@"> +<!ENTITY NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT "@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT "@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@"> -<!ENTITY NM_CONFIG_DEFAULT_DNS_RC_MANAGER "@NM_CONFIG_DEFAULT_DNS_RC_MANAGER@"> -<!ENTITY NM_CONFIG_DEFAULT_DHCP "@NM_CONFIG_DEFAULT_DHCP@"> +<!ENTITY NM_CONFIG_DEFAULT_MAIN_RC_MANAGER "@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER@"> +<!ENTITY NM_CONFIG_DEFAULT_MAIN_DHCP "@NM_CONFIG_DEFAULT_MAIN_DHCP@"> 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; |