vpn: add a new field so VPN plugins can specify multiple domains

This commit is contained in:
Evan Broder 2012-03-15 14:56:26 -07:00 committed by Dan Williams
parent 956e63a673
commit 447342744e
2 changed files with 12 additions and 0 deletions

View file

@ -151,6 +151,9 @@ typedef enum {
/* string: DNS domain name */
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN "domain"
/* array of strings: DNS domain names */
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS "domains"
/* string: Login message */
#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER "banner"

View file

@ -547,6 +547,15 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
if (val)
nm_ip4_config_add_domain (config, g_value_get_string (val));
val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS);
if (val) {
const char **domains = g_value_get_boxed (val);
const char **domain;
for (domain = domains; domain && *domain; domain++)
nm_ip4_config_add_domain (config, *domain);
}
val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_BANNER);
if (val) {
g_free (priv->banner);