colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns: refactor NMDnsManagerResolvConfMode to string conversion

Browse Source
This commit is contained in:
Thomas Haller
2016-03-21 16:43:09 +01:00
parent 4faaa3eb0b
commit f73621a545
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dns-manager/nm-dns-manager.c
View File

@@ -161,6 +161,13 @@ typedef struct {
GPtrArray *nis_servers; GPtrArray *nis_servers;
} NMResolvConfData; } NMResolvConfData;
NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_rc_manager_to_string, NMDnsManagerResolvConfManager,
NM_UTILS_LOOKUP_DEFAULT_WARN (NULL),
NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, "none"),
NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, "resolvconf"),
NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG, "netconfig"),
);
static void static void
add_string_item (GPtrArray *array, const char *str) add_string_item (GPtrArray *array, const char *str)
{ {
@@ -1374,7 +1381,7 @@ static void
init_resolv_conf_manager (NMDnsManager *self) init_resolv_conf_manager (NMDnsManager *self)
{ {
NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self); NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
const char *man, *desc = ""; const char *man;
man = nm_config_data_get_rc_manager (nm_config_get_data (priv->config)); man = nm_config_data_get_rc_manager (nm_config_get_data (priv->config));
if (!g_strcmp0 (man, "none")) if (!g_strcmp0 (man, "none"))
@@ -1395,19 +1402,7 @@ init_resolv_conf_manager (NMDnsManager *self)
_LOGW ("unknown resolv.conf manager '%s'", man); _LOGW ("unknown resolv.conf manager '%s'", man);
} }
switch (priv->rc_manager) { _LOGI ("using resolv.conf manager '%s'", _rc_manager_to_string (priv->rc_manager));
case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
desc = "resolvconf";
break;
case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:
desc = "netconfig";
break;
case NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE:
desc = "none";
break;
}
_LOGI ("using resolv.conf manager '%s'", desc);
} }
static void static void