Merge from master

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 537ea34..5385955 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -5491,7 +5491,7 @@ static void update_config()
 
                while (*shost && (shost < e))
                {
 
                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'))
 
                        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++;
                        }
                                config->multi_n_hostname[config->nbmultihostname][i] = *n;
                                n++;i++;
                        }

+

                        if (i > 0)
                        {
                                config->multi_n_hostname[config->nbmultihostname][i] = 0;
                        if (i > 0)
                        {
                                config->multi_n_hostname[config->nbmultihostname][i] = 0;


@@ -5506,6 +5507,8 @@ static void update_config()
                                config->nbmultihostname++;
                                if (config->nbmultihostname >= MAX_NBHOSTNAME) break;
                        }
                                config->nbmultihostname++;
                                if (config->nbmultihostname >= MAX_NBHOSTNAME) break;
                        }

+
+                       shost = n;

                }
 
                if (config->nbmultihostname >= 1)
                }
 
                if (config->nbmultihostname >= 1)