 @@ -1,14 +1,14 @@
-/*     $NetBSD: prop_array.h,v 1.6.2.1 2008/06/23 04:26:44 wrstuden Exp $    */
+/*     $NetBSD: prop_array.h,v 1.6.2.2 2008/09/24 16:30:24 wrstuden Exp $    */
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -114,26 +114,38 @@ bool		prop_array_set_int32(prop_array_t,
 					  int32_t);
 bool		prop_array_set_uint32(prop_array_t, unsigned int,
 					   uint32_t);
 bool		prop_array_get_int64(prop_array_t, unsigned int,
 					  int64_t *);
 bool		prop_array_get_uint64(prop_array_t, unsigned int,
 					   uint64_t *);
 bool		prop_array_set_int64(prop_array_t, unsigned int,
 					  int64_t);
 bool		prop_array_set_uint64(prop_array_t, unsigned int,
 					   uint64_t);
 bool		prop_array_add_int8(prop_array_t, int8_t);
 bool		prop_array_add_uint8(prop_array_t, uint8_t);
 bool		prop_array_add_int16(prop_array_t, int16_t);
 bool		prop_array_add_uint16(prop_array_t, uint16_t);
 bool		prop_array_add_int32(prop_array_t, int32_t);
 bool		prop_array_add_uint32(prop_array_t, uint32_t);
 bool		prop_array_add_int64(prop_array_t, int64_t);
 bool		prop_array_add_uint64(prop_array_t, uint64_t);
 bool		prop_array_get_cstring(prop_array_t, unsigned int,
 					     char **);
 bool		prop_array_set_cstring(prop_array_t, unsigned int,
 					    const char *);
 bool		prop_array_get_cstring_nocopy(prop_array_t,
                                                    unsigned int,
 						   const char **);
 bool		prop_array_set_cstring_nocopy(prop_array_t,
 						   unsigned int,
 						   const char *);
 __END_DECLS

 @@ -1,14 +1,14 @@
-/* $NetBSD: strtoull.c,v 1.1.26.1 2008/09/18 04:54:18 wrstuden Exp $ */
+/* $NetBSD: strtoull.c,v 1.1.26.2 2008/09/24 16:30:24 wrstuden Exp $ */
 /*-
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
  * Copyright (c) 2003 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,28 +21,32 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: strtoull.c,v 1.1.26.1 2008/09/18 04:54:18 wrstuden Exp $");
+__RCSID("$NetBSD: strtoull.c,v 1.1.26.2 2008/09/24 16:30:24 wrstuden Exp $");
 #ifdef _LIBC
 #include "namespace.h"
 #endif
 #if defined(_KERNEL)
 #include <sys/param.h>
 #include <lib/libkern/libkern.h>
 #elif defined(_STANDALONE)
 #include <sys/param.h>
 #include <lib/libkern/libkern.h>
 #include <lib/libsa/stand.h>
 #else

 @@ -1,14 +1,14 @@
-/* $NetBSD: strtoumax.c,v 1.1.28.1 2008/09/18 04:54:18 wrstuden Exp $ */
+/* $NetBSD: strtoumax.c,v 1.1.28.2 2008/09/24 16:30:24 wrstuden Exp $ */
 /*-
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
  * Copyright (c) 2003 Citrus Project,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,28 +21,32 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: strtoumax.c,v 1.1.28.1 2008/09/18 04:54:18 wrstuden Exp $");
+__RCSID("$NetBSD: strtoumax.c,v 1.1.28.2 2008/09/24 16:30:24 wrstuden Exp $");
 #ifdef _LIBC
 #include "namespace.h"
 #endif
 #if defined(_KERNEL)
 #include <sys/param.h>
 #include <lib/libkern/libkern.h>
 #elif defined(_STANDALONE)
 #include <sys/param.h>
 #include <lib/libkern/libkern.h>
 #include <lib/libsa/stand.h>
 #else

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: prop_array_util.3,v 1.2.4.2 2008/06/23 05:01:56 wrstuden Exp $
+.\"	$NetBSD: prop_array_util.3,v 1.2.4.3 2008/09/24 16:30:24 wrstuden Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Jason R. Thorpe.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\" notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -40,26 +40,34 @@
 .Nm prop_array_set_uint8 ,
 .Nm prop_array_get_int16 ,
 .Nm prop_array_get_uint16 ,
 .Nm prop_array_set_int16 ,
 .Nm prop_array_set_uint16 ,
 .Nm prop_array_get_int32 ,
 .Nm prop_array_get_uint32 ,
 .Nm prop_array_set_int32 ,
 .Nm prop_array_set_uint32 ,
 .Nm prop_array_get_int64 ,
 .Nm prop_array_get_uint64 ,
 .Nm prop_array_set_int64 ,
 .Nm prop_array_set_uint64 ,
 .Nm prop_array_add_int8 ,
 .Nm prop_array_add_uint8 ,
 .Nm prop_array_add_int16 ,
 .Nm prop_array_add_uint16 ,
 .Nm prop_array_add_int32 ,
 .Nm prop_array_add_uint32 ,
 .Nm prop_array_add_int64 ,
 .Nm prop_array_add_uint64 ,
 .Nm prop_array_get_cstring ,
 .Nm prop_array_set_cstring ,
 .Nm prop_array_get_cstring_nocopy ,
 .Nm prop_array_set_cstring_nocopy
 .Sh LIBRARY
 .Lb libprop
 .Sh SYNOPSIS
 .In prop/proplib.h
 .\"
 .Ft bool
 .Fn prop_array_get_bool "prop_array_t dict" "unsigned int indx" \
     "bool *valp"
 .Ft bool
 @@ -109,26 +117,50 @@
 .Fn prop_array_get_int64 "prop_array_t dict" "unsigned int indx" \
     "int64_t *valp"
 .Ft bool
 .Fn prop_array_get_uint64 "prop_array_t dict" "unsigned int indx" \
     "uint64_t *valp"
 .Ft bool
 .Fn prop_array_set_int64 "prop_array_t dict" "unsigned int indx" \
     "int64_t val"
 .Ft bool
 .Fn prop_array_set_uint64 "prop_array_t dict" "unsigned int indx" \
     "uint64_t val"
 .\"
 .Ft bool
 .Fn prop_array_set_int32 "prop_array_t dict" "unsigned int indx" \
     "int32_t val"
 .Ft bool
 .Fn prop_array_set_uint32 "prop_array_t dict" "unsigned int indx" \
     "uint32_t val"
 .\"
 .Ft bool
 .Fn prop_array_add_int8 "prop_array_t dict" "int8_t val"
 .Ft bool
 .Fn prop_array_add_uint8 "prop_array_t dict" "uint8_t val"
 .Ft bool
 .Fn prop_array_add_int16 "prop_array_t dict"  "int16_t val"
 .Ft bool
 .Fn prop_array_add_uint16 "prop_array_t dict" "uint16_t val"
 .Ft bool
 .Fn prop_array_add_int32 "prop_array_t dict" "int32_t val"
 .Ft bool
 .Fn prop_array_add_uint32 "prop_array_t dict" "uint32_t val"
 .Ft bool
 .Fn prop_array_add_int64 "prop_array_t dict"  "int64_t val"
 .Ft bool
 .Fn prop_array_add_uint64 "prop_array_t dict" "uint64_t val"
 .\"
 .Ft bool
 .Fn prop_array_get_cstring "prop_array_t dict" "unsigned int indx" \
     "char **strp"
 .Ft bool
 .Fn prop_array_set_cstring "prop_array_t dict" "unsigned int indx" \
     "const char *str"
 .\"
 .Ft bool
 .Fn prop_array_get_cstring_nocopy "prop_array_t dict" \
     "unsigned int indx" "const char **strp"
 .Ft bool
 .Fn prop_array_set_cstring_nocopy "prop_array_t dict" \
     "unsigned int indx" "const char *strp"
 .Sh DESCRIPTION

 @@ -1,14 +1,14 @@
-/*	$NetBSD: prop_array_util.c,v 1.1.4.2 2008/06/23 05:01:56 wrstuden Exp $	*/
+/*	$NetBSD: prop_array_util.c,v 1.1.4.3 2008/09/24 16:30:24 wrstuden Exp $	*/
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -149,26 +149,58 @@ prop_array_set_uint ## size (prop_array_
 				  unsigned int indx,			\
 				  uint ## size ## _t val)		\
 {									\
 	prop_number_t num;						\
 	int rv;								\
+									\
 	num = prop_number_create_unsigned_integer((uint64_t) val);	\
 	if (num == NULL)						\
 		return (false);						\
 	rv = prop_array_set(array, indx, num);				\
 	prop_object_release(num);					\
+									\
 	return (rv);							\
 }									\
+									\
 bool									\
 prop_array_add_int ## size (prop_array_t array,				\
 				 int ## size ## _t val)			\
 {									\
 	prop_number_t num;						\
 	int rv;								\
+									\
 	num = prop_number_create_integer((int64_t) val);		\
 	if (num == NULL)						\
 		return (false);						\
 	rv = prop_array_add(array, num);				\
 	prop_object_release(num);					\
+									\
 	return (rv);							\
 }									\
+									\
 bool									\
 prop_array_add_uint ## size (prop_array_t array,			\
 				  uint ## size ## _t val)		\
 {									\
 	prop_number_t num;						\
 	int rv;								\
+									\
 	num = prop_number_create_integer((int64_t) val);		\
 	if (num == NULL)						\
 		return (false);						\
 	rv = prop_array_add(array, num);				\
 	prop_object_release(num);					\
+									\
 	return (rv);							\
+}
 TEMPLATE(8)
 TEMPLATE(16)
 TEMPLATE(32)
 TEMPLATE(64)
 #undef TEMPLATE
 #define	TEMPLATE(variant, qualifier)					\
 bool								        \
 prop_array_get_cstring ## variant (prop_array_t array,		        \
 					unsigned int indx,		\

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isakmp_inf.c,v 1.27.2.2 2008/09/18 04:54:19 wrstuden Exp $	*/
+/*	$NetBSD: isakmp_inf.c,v 1.27.2.3 2008/09/24 16:30:24 wrstuden Exp $	*/
 /* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -1199,40 +1199,54 @@ purge_ipsec_spi(dst0, proto, spi, n)
+		}
 #ifdef ENABLE_NATT
 		natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE];
 		if (natt_type && natt_type->sadb_x_nat_t_type_type) {
 			/* NAT-T is enabled for this SADB entry; copy
 			 * the ports from NAT-T extensions */
 			natt_port = (void *)mhp[SADB_X_EXT_NAT_T_SPORT];
 			if (extract_port(src) == 0 && natt_port != NULL)
 				set_port(src, ntohs(natt_port->sadb_x_nat_t_port_port));
 			natt_port = (void *)mhp[SADB_X_EXT_NAT_T_DPORT];
 			if (extract_port(dst) == 0 && natt_port != NULL)
 				set_port(dst, ntohs(natt_port->sadb_x_nat_t_port_port));
 		}else{
 			/* Force default UDP ports, so CMPSADDR will match SAs with NO encapsulation
 			 */
 			set_port(src, PORT_ISAKMP);
 			set_port(dst, PORT_ISAKMP);
+		}
 #endif
 		plog(LLV_DEBUG2, LOCATION, NULL, "src: %s\n", saddr2str(src));
 		plog(LLV_DEBUG2, LOCATION, NULL, "dst: %s\n", saddr2str(dst));
 		/* XXX n^2 algorithm, inefficient */
 		/* don't delete inbound SAs at the moment */
 		/* XXX should we remove SAs with opposite direction as well? */
 		if (CMPSADDR(dst0, dst)) {
 			msg = next;
 			continue;
+		}
 #ifdef ENABLE_NATT
 		if (natt_type == NULL ||
 			! natt_type->sadb_x_nat_t_type_type) {
 			/* Set back port to 0 if it was forced to default UDP port
 			 */
 			set_port(src, 0);
 			set_port(dst, 0);
+		}
 #endif
 		for (i = 0; i < n; i++) {
 			plog(LLV_DEBUG, LOCATION, NULL,
 				"check spi(packet)=%u spi(db)=%u.\n",
 				ntohl(spi[i]), ntohl(sa->sadb_sa_spi));
 			if (spi[i] != sa->sadb_sa_spi)
 				continue;
 			pfkey_send_delete(lcconf->sock_pfkey,
 				msg->sadb_msg_satype,
 				IPSEC_MODE_ANY,
 				src, dst, sa->sadb_sa_spi);
 			/*

 @@ -1,16 +1,16 @@
-/*	$NetBSD: pfkey.c,v 1.27.4.2 2008/09/18 04:54:19 wrstuden Exp $	*/
+/*	$NetBSD: pfkey.c,v 1.27.4.3 2008/09/24 16:30:24 wrstuden Exp $	*/
-/* $Id: pfkey.c,v 1.27.4.2 2008/09/18 04:54:19 wrstuden Exp $ */
+/* $Id: pfkey.c,v 1.27.4.3 2008/09/24 16:30:24 wrstuden Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -910,28 +910,28 @@ pk_sendgetspi(iph2)
+		}
 		mode = ipsecdoi2pfkey_mode(pr->encmode);
 		if (mode == ~0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"invalid encmode %d\n", pr->encmode);
 			racoon_free(src);
 			racoon_free(dst);
 			return -1;
+		}
 #ifdef ENABLE_NATT
 		if (! pr->udp_encap) {
 			/* Remove port information, that SA doesn't use it */
-			set_port(src, 0);
+			set_port(iph2->src, 0);
-			set_port(dst, 0);
+			set_port(iph2->dst, 0);
+		}
 #endif
 		plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_getspi\n");
 		if (pfkey_send_getspi(
 				lcconf->sock_pfkey,
 				satype,
 				mode,
 				dst,			/* src of SA */
 				src,			/* dst of SA */
 				minspi, maxspi,
 				pr->reqid_in, iph2->seq) < 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 				"ipseclib failed send getspi (%s)\n",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: misc.c,v 1.21 2008/04/06 23:38:19 christos Exp $	*/
+/*	$NetBSD: misc.c,v 1.21.4.1 2008/09/24 16:30:24 wrstuden Exp $	*/
 /* $OpenBSD: misc.c,v 1.67 2008/01/01 08:47:04 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,33 +16,34 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: misc.c,v 1.21 2008/04/06 23:38:19 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.21.4.1 2008/09/24 16:30:24 wrstuden Exp $");
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <net/if.h>
 #include <net/if_tun.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <paths.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -630,82 +631,96 @@ read_keyfile_line(FILE *f, const char *f
 			    filename, *lineno);
 			/* discard remainder of line */
 			while (fgetc(f) != '\n' && !feof(f))
 				;	/* nothing */
+		}
+	}
 	return -1;
+}
 int
 tun_open(int tun, int mode)
+{
 	struct ifreq ifr;
-	char name[100];
+	int fd = -1, sock, flag;
-	int fd = -1, sock;
+	const char *tunbase = mode == SSH_TUNMODE_ETHERNET ? "tap" : "tun";
 	/* Open the tunnel device */
 	if (tun <= SSH_TUNID_MAX) {
-		snprintf(name, sizeof(name), "/dev/tun%d", tun);
+		snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),
-		fd = open(name, O_RDWR);
+		    "/dev/%s%d", tunbase, tun);
 		fd = open(ifr.ifr_name, O_RDWR);
 	} else if (tun == SSH_TUNID_ANY) {
 		for (tun = 100; tun >= 0; tun--) {
-			snprintf(name, sizeof(name), "/dev/tun%d", tun);
+			snprintf(ifr.ifr_name, sizeof(ifr.ifr_name),
-			if ((fd = open(name, O_RDWR)) >= 0)
+			    "/dev/%s%d", tunbase, tun);
 			if ((fd = open(ifr.ifr_name, O_RDWR)) >= 0)
 				break;
+		}
 	} else {
 		debug("%s: invalid tunnel %u", __func__, tun);
 		return (-1);
+	}
 	if (fd < 0) {
-		debug("%s: %s open failed: %s", __func__, name, strerror(errno));
+		debug("%s: %s open failed: %s", __func__, ifr.ifr_name,
 		    strerror(errno));
 		return (-1);
+	}
-	debug("%s: %s mode %d fd %d", __func__, name, mode, fd);
+	/* Turn on tunnel headers */
 	flag = 1;
 	if (mode != SSH_TUNMODE_ETHERNET &&
 	    ioctl(fd, TUNSIFHEAD, &flag) == -1) {
 		debug("%s: ioctl(%d, TUNSIFHEAD, 1): %s", __func__, fd,
 		    strerror(errno));
 		close(fd);
 		return -1;
+	}
 	debug("%s: %s mode %d fd %d", __func__, ifr.ifr_name, mode, fd);
 	/* Set the tunnel device operation mode */
 	snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "tun%d", tun);
 	if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
 		goto failed;
 	if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1)
 		goto failed;
 #if 0
 	/* Set interface mode */
 	ifr.ifr_flags &= ~IFF_UP;
 	if (mode == SSH_TUNMODE_ETHERNET)
 		ifr.ifr_flags |= IFF_LINK0;
 	else
 		ifr.ifr_flags &= ~IFF_LINK0;
 	if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
 		goto failed;
 #endif
 	/* Bring interface up */
 	ifr.ifr_flags |= IFF_UP;
 	if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
 		goto failed;
 	close(sock);
 	return (fd);
  failed:
 	if (fd >= 0)
 		close(fd);
 	if (sock >= 0)
 		close(sock);
-	debug("%s: failed to set %s mode %d: %s", __func__, name,
+	debug("%s: failed to set %s mode %d: %s", __func__, ifr.ifr_name,
 	    mode, strerror(errno));
 	return (-1);
+}
 void
 sanitise_stdfd(void)
+{
 	int nullfd, dupfd;
 	if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
 		fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno));
 		exit(1);
+	}

 @@ -1,13 +1,21 @@
 -09-17  Yvan Vanhullebus  <vanhu@netasq.com>
 	* src/racoon/isakmp_inf.c: Fixed port match in purge_ipsec_spi()
 	  when NAT-T enabled and trying to purge non NAT-T SAs.
 -09-09  Yvan Vanhullebus  <vanhu@netasq.com>
 	* src/racoon/pfkey.c: Some calls to set_port() were not correctly
 	updated in the previous commit.
 -09-03  Yvan Vanhullebus  <vanhu@netasq.com>
 	From Tomas Mraz <tmraz@redhat.com>:
 	* src/racoon/pfkey.c: Duplicate addresses in pk_sendxxx functions, as
 	  they may be altered for NAT-T stuff.
 -09-03  Timo Teras  <timo.teras@iki.fi>
 	* src/libipsec/pfkey.c: no satype check for Linux spdflush messages
 	* src/racoon/pfkey.c: handle SPD dump responses in pfkey_reload()
 	  to make configuration reloading work better
 	* src/racoon/sockmisc.c: it is not an error to call extract_port()
 	  with AF_UNSPEC address (happens with anonymous config blocks)
 -08-12  Yvan Vanhullebus  <vanhu@netasq.com>