From: fendo Date: Wed, 22 May 2013 20:25:27 +0000 (+0200) Subject: Merge branch 'master' into samesversion X-Git-Tag: 2.2.1-2sames3.9~1 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/e48cb2390b22683deb1a0fab8c01e79d3fa908ba?hp=e843431b6078e2fbfd8782f65f2cd2beadbdb0cc Merge branch 'master' into samesversion --- diff --git a/l2tpns.c b/l2tpns.c index 77c302c..5385955 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -5491,7 +5491,7 @@ static void update_config() while (*shost && (shost < e)) { - while ((n < e) && (*n == ' ' || *n == '\t')) n++; + while ((n < e) && (*n == ' ' || *n == ',' || *n == '\t')) n++; i = 0; while (n < e && (*n != ',') && (*n != '\t')) @@ -5499,6 +5499,7 @@ static void update_config() config->multi_n_hostname[config->nbmultihostname][i] = *n; n++;i++; } + if (i > 0) { config->multi_n_hostname[config->nbmultihostname][i] = 0;