From: Julien Muchembled <jm@jmuchemb.eu>
Date: Thu, 28 Apr 2011 11:21:55 +0000 (+0200)
Subject: Fix command-line '-o' option for host configuration
X-Git-Tag: release-1.0.14~7
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=f11c6101f30df645223920bef3eb7592de9bcb79;hp=0aa86d4b8b3010522e6de8842f5bd29004ba3df6

Fix command-line '-o' option for host configuration

This fixes a regression introduced by commit 667b1ba while refactoring option
parsing code.
---

diff --git a/src/conf.c b/src/conf.c
index 07279531..f55fa82b 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -342,18 +342,29 @@ void read_config_options(avl_tree_t *config_tree, const char *prefix) {
 	size_t prefix_len = prefix ? strlen(prefix) : 0;
 
 	for(node = cmdline_conf->tail; node; node = next) {
-		config_t *cfg = (config_t *)node->data;
+		config_t *orig_cfg, *cfg = (config_t *)node->data;
 		next = node->prev;
 
-		if(!prefix && strchr(cfg->variable, '.'))
-			continue;
-
-		if(prefix && (strncmp(prefix, cfg->variable, prefix_len) || cfg->variable[prefix_len] != '.'))
-			continue;
-
+		if(!prefix) {
+			if(strchr(cfg->variable, '.'))
+				continue;
+			node->data = NULL;
+			list_unlink_node(cmdline_conf, node);
+		} else {
+			if(strncmp(prefix, cfg->variable, prefix_len) ||
+			   cfg->variable[prefix_len] != '.')
+				continue;
+			/* Because host configuration is parsed again when
+			   reconnecting, nodes must not be freed when a prefix
+			   is given. */
+			orig_cfg = cfg;
+			cfg = new_config();
+			cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
+			cfg->value = xstrdup(orig_cfg->value);
+			cfg->file = NULL;
+			cfg->line = orig_cfg->line;
+		}
 		config_add(config_tree, cfg);
-		node->data = NULL;
-		list_unlink_node(cmdline_conf, node);
 	}
 }