From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 12 Jul 2014 20:25:55 +0000 (+0200)
Subject: Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1
X-Git-Tag: release-1.1pre11~60
X-Git-Url: http://tinc-vpn.org/git/browse?a=commitdiff_plain;h=19e42b76f546dc3baee4a5d6a4f161155d279c74;hp=f704304823df0ac868786ac89355eda38592dc3f;p=tinc

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

diff --git a/src/net_setup.c b/src/net_setup.c
index 96a72247..d83c5723 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1141,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();