X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=a4c0d27e902d373ee4c9fcacc0442d48393e8c75;hb=5217c16db4babd64580c2fd7aa36180bb9bd838c;hp=4940ddb593b87810885c58b0368508013970b9f1;hpb=41583d5dcfc1277b1a203478de4cce2cd0cda1b1;p=tinc

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 4940ddb5..a4c0d27e 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -48,7 +48,6 @@ static enum {
 } device_type = DEVICE_TYPE_TUN;
 
 int device_fd = -1;
-static int if_fd = -1;
 static int ip_fd = -1;
 char *device = NULL;
 char *iface = NULL;
@@ -134,6 +133,7 @@ static bool setup_device(void) {
 		}
 	}
 
+	int if_fd;
 	if((if_fd = open(device, O_RDWR, 0)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", device, strerror(errno));
 		return false;
@@ -287,11 +287,11 @@ static void close_device(void) {
 		}
 	}
 
-	close(ip_fd);
-	close(device_fd);
+	close(ip_fd); ip_fd = -1;
+	close(device_fd); device_fd = -1;
 
-	free(device);
-	free(iface);
+	free(device); device = NULL;
+	free(iface); iface = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {