Update THANKS and copyright information.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index da58a45..5f8fdb1 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,8 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -338,26 +339,36 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 
 void read_config_options(avl_tree_t *config_tree, const char *prefix) {
        list_node_t *node, *next;
-       size_t prefix_len = strlen(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);
        }
 }
 
 bool read_server_config() {
-       list_node_t *node, *next;
        char *fname;
        bool x;
 
@@ -376,8 +387,6 @@ bool read_server_config() {
 }
 
 bool read_connection_config(connection_t *c) {
-       list_node_t *node, *next;
-       size_t name_len = strlen(c->name);
        char *fname;
        bool x;
 
@@ -458,24 +467,33 @@ bool disable_old_keys(FILE *f) {
        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';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       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';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       if(fseek(f, pos, SEEK_SET))
+                               break;
+                       if(fputs(buf, f) <= 0)
+                               break;
                        disabled = true;
                }
                pos = ftell(f);
+               if(pos < 0)
+                       break;
        }
 
        return disabled;