Cleanups.

diff --git a/configure.in b/configure.in
index 1e2b802c39936638015df11e8fc35806e683a2bb..9287c01afdc3b7d39167b299bf4b6d3a0b5bf5d6 100644 (file)
--- 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 f7db4c239f0428c5b2a86dc17b85f22d65d63709..cbfebc23866a85ff22078374b063b29041e7fa07 100644 (file)
--- 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 dfda08951f01de73ab8b47828004042a47f19771..e1fbf2200cdfc4b0a1738ad6e3a704e51c87ab45 100644 (file)
--- 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;