Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index c4f2127ec0dee48bfe9a4f79c8ee48cfb35aef60..d83c57235d1d9b54ea2291780ff3040c36fa7962 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -445,7 +445,6 @@ bool setup_myself_reloadable(void) {
        char *fmode = NULL;
        char *bmode = NULL;
        char *afname = NULL;
-       char *address = NULL;
        char *space;
        bool choice;
 
@@ -1142,7 +1141,8 @@ void close_network_connections(void) {
 
        if (device_fd >= 0)
                io_del(&device_io);
-       devops.close();
+       if (devops.close)
+               devops.close();
 
        exit_control();