Remove unused '#include's.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index e0e0388..35a84be 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -48,14 +48,11 @@
 #endif
 
 #include "conf.h"
-#include "control.h"
 #include "crypto.h"
-#include "device.h"
 #include "event.h"
 #include "logger.h"
 #include "names.h"
 #include "net.h"
-#include "netutl.h"
 #include "process.h"
 #include "protocol.h"
 #include "utils.h"
@@ -297,7 +294,7 @@ static bool parse_options(int argc, char **argv) {
 
 exit_fail:
        free_names();
-       free(cmdline_conf);
+       list_delete_list(cmdline_conf);
        cmdline_conf = NULL;
        return false;
 }
@@ -387,7 +384,7 @@ static void cleanup() {
                exit_configuration(&config_tree);
        }
 
-       free(cmdline_conf);
+       list_delete_list(cmdline_conf);
        free_names();
 }
 
@@ -504,7 +501,7 @@ int main(int argc, char **argv) {
        srand(now.tv_sec + now.tv_usec);
        crypto_init();
 
-       if(!read_server_config()) {
+       if(!read_server_config(config_tree)) {
                return 1;
        }