Don't call exit_control() if we didn't do init_control().

diff --git a/src/tincd.c b/src/tincd.c
index 23845fff1f2942ada86b7e229c96ab307adf2347..9d2b03b2758c78d59dc2ec0e50390a77cd557cb0 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -92,7 +92,7 @@ char *logfilename = NULL;                     /* log file location */
 char *controlcookiename = NULL;
 char **g_argv;                                 /* a copy of the cmdline arguments */
 
-static int status;
+static int status = 1;
 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},
@@ -434,10 +434,10 @@ int main2(int argc, char **argv) {
        /* Setup sockets and open device. */
 
        if(!setup_network())
-               goto end;
+               goto end_nonet;
 
        if(!init_control())
-               return 1;
+               goto end_nonet;
 
        /* Initiate all outgoing connections. */
 
@@ -488,10 +488,11 @@ int main2(int argc, char **argv) {
        close_network_connections();
 
 end:
-       logger(LOG_NOTICE, "Terminating");
-
        exit_control();
 
+end_nonet:
+       logger(LOG_NOTICE, "Terminating");
+
        crypto_exit();
 
        exit_configuration(&config_tree);