From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 29 Jul 2003 23:21:01 +0000 (+0000)
Subject: Cleanups.
X-Git-Tag: release-1.0~33
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=2ed154e73192d5e162544bc570abbb3a1df3ec83;p=tinc

Cleanups.
---

diff --git a/configure.in b/configure.in
index 1e2b802c..9287c01a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.73 2003/07/29 11:50:39 guus Exp $
+dnl $Id: configure.in,v 1.13.2.74 2003/07/29 23:21:00 guus Exp $
 
 AC_PREREQ(2.57)
 AC_INIT(src/tincd.c)
@@ -155,7 +155,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime fork get_current_dir_name gettimeofday mlockall putenv select strdup strerror strsignal strtol unsetenv vsyslog])
+AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol unsetenv vsyslog])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index f7db4c23..cbfebc23 100644
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.13 2003/07/29 12:18:35 guus Exp $
+    $Id: device.c,v 1.1.2.14 2003/07/29 23:21:01 guus Exp $
 */
 
 #include "system.h"
@@ -139,8 +139,11 @@ bool setup_device(void)
 		return false;
 	}
 
-	device = adapterid;
-	iface = adaptername;	
+	if(!device)
+		device = xstrdup(adapterid);
+
+	if(!iface)
+		iface = xstrdup(adaptername);
 
 	snprintf(tapname, sizeof(tapname), USERMODEDEVICEDIR "%s" TAPSUFFIX, device);
 	
diff --git a/src/mingw/device.c b/src/mingw/device.c
index dfda0895..e1fbf220 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.6 2003/07/29 22:59:01 guus Exp $
+    $Id: device.c,v 1.1.2.7 2003/07/29 23:21:01 guus Exp $
 */
 
 #include "system.h"
@@ -177,6 +177,8 @@ bool setup_device(void)
 		len = sizeof(adaptername);
 		RegQueryValueEx(key2, "Name", 0, 0, adaptername, &len);
 
+		RegKeyClose(key2);
+
 		if(device) {
 			if(!strcmp(device, adapterid)) {
 				found = true;
@@ -201,6 +203,8 @@ bool setup_device(void)
 		}
 	}
 
+	RegKeyClose(key);
+
 	if(!found) {
 		logger(LOG_ERR, _("No Windows tap device found!"));
 		return false;