Re: [PATCH] If vpnc supports multiple domains, pass them all back to NM



On Thu, 2012-03-15 at 14:57 -0700, Evan Broder wrote:
> ---
>  src/nm-vpnc-service-vpnc-helper.c |   25 +++++++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)

Pushed, thanks.

Dan

> diff --git a/src/nm-vpnc-service-vpnc-helper.c b/src/nm-vpnc-service-vpnc-helper.c
> index 21942f6..bc91771 100644
> --- a/src/nm-vpnc-service-vpnc-helper.c
> +++ b/src/nm-vpnc-service-vpnc-helper.c
> @@ -198,6 +198,26 @@ addr_list_to_gvalue (const char *str)
>  }
>  
>  static GValue *
> +split_dns_list_to_gvalue (const char *str)
> +{
> +	GValue *val;
> +	char **split;
> +
> +	if (!str || strlen (str) < 1)
> +		return NULL;
> +
> +	split = g_strsplit (str, ",", -1);
> +	if (g_strv_length (split) == 0)
> +		return NULL;
> +
> +	val = g_slice_new0 (GValue);
> +	g_value_init (val, G_TYPE_STRV);
> +	g_value_take_boxed (val, split);
> +
> +	return val;
> +}
> +
> +static GValue *
>  get_routes (void)
>  {
>  	GValue *value = NULL;
> @@ -389,6 +409,11 @@ main (int argc, char *argv[])
>  	if (val)
>  		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val);
>  
> +	/* Split DNS domains */
> +	val = split_dns_list_to_gvalue (getenv ("CISCO_SPLIT_DNS"));
> +	if (val)
> +		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, val);
> +
>  	/* Routes */
>  	val = get_routes ();
>  	if (val) {




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]