X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=b1529e573115a1cb9528c664a03e8db4f10adc0d;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=d7df4e96893e240a9ae4616dfa53177be5989dd0;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;p=tinc

diff --git a/src/conf.c b/src/conf.c
index d7df4e96..b1529e57 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,7 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
 		  2000 Cris van Pelt
 
@@ -339,33 +339,31 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
 }
 
 void read_config_options(splay_tree_t *config_tree, const char *prefix) {
-	list_node_t *node, *next;
 	size_t prefix_len = prefix ? strlen(prefix) : 0;
 
-	for(node = cmdline_conf->tail; node; node = next) {
-		config_t *orig_cfg, *cfg = (config_t *)node->data;
-		next = node->prev;
+	for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
+		const config_t *cfg = node->data;
+		config_t *new;
 
 		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);
+
+		new = new_config();
+		if(prefix)
+			new->variable = xstrdup(cfg->variable + prefix_len + 1);
+		else
+			new->variable = xstrdup(cfg->variable);
+		new->value = xstrdup(cfg->value);
+		new->file = NULL;
+		new->line = cfg->line;
+
+		config_add(config_tree, new);
 	}
 }
 
@@ -375,7 +373,7 @@ bool read_server_config(void) {
 
 	read_config_options(config_tree, NULL);
 
-	xasprintf(&fname, "%s/tinc.conf", confbase);
+	xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);
 
 	if(!x) {				/* System error: complain */
@@ -387,14 +385,14 @@ bool read_server_config(void) {
 	return x;
 }
 
-bool read_connection_config(connection_t *c) {
+bool read_host_config(splay_tree_t *config_tree, const char *name) {
 	char *fname;
 	bool x;
 
-	read_config_options(c->config_tree, c->name);
+	read_config_options(config_tree, name);
 
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
+	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+	x = read_config_file(config_tree, fname);
 	free(fname);
 
 	return x;
@@ -402,7 +400,7 @@ bool read_connection_config(connection_t *c) {
 
 bool append_config_file(const char *name, const char *key, const char *value) {
 	char *fname;
-	xasprintf(&fname, "%s/hosts/%s", confbase, name);
+	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 
 	FILE *fp = fopen(fname, "a");
 
@@ -415,45 +413,5 @@ bool append_config_file(const char *name, const char *key, const char *value) {
 
 	free(fname);
 
-	return fp;
-}
-
-bool disable_old_keys(FILE *f) {
-	char buf[100];
-	long pos;
-	bool disabled = false;
-
-	rewind(f);
-	pos = ftell(f);
-
-	if(pos < 0)
-		return false;
-
-	while(fgets(buf, sizeof buf, f)) {
-		if(!strncmp(buf, "-----BEGIN RSA", 14)) {	
-			buf[11] = 'O';
-			buf[12] = 'L';
-			buf[13] = 'D';
-			if(fseek(f, pos, SEEK_SET))
-				break;
-			if(fputs(buf, f) <= 0)
-				break;
-			disabled = true;
-		}
-		else if(!strncmp(buf, "-----END RSA", 12)) {	
-			buf[ 9] = 'O';
-			buf[10] = 'L';
-			buf[11] = 'D';
-			if(fseek(f, pos, SEEK_SET))
-				break;
-			if(fputs(buf, f) <= 0)
-				break;
-			disabled = true;
-		}
-		pos = ftell(f);
-		if(pos < 0)
-			break;
-	}
-
-	return disabled;
+	return fp != NULL;
 }