--- embedaddon/ipsec-tools/src/racoon/isakmp.c	2013/07/22 12:28:07	1.1.1.1.2.1
+++ embedaddon/ipsec-tools/src/racoon/isakmp.c	2014/06/15 16:37:12	1.1.1.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp.c,v 1.71 2011/03/15 13:20:14 vanhu Exp $	*/
+/*	$NetBSD: isakmp.c,v 1.71.2.2 2012/08/29 08:55:26 tteras Exp $	*/
 
 /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
 
@@ -1128,7 +1128,10 @@ isakmp_ph1begin_i(rmconf, remote, local)
 
 /* new negotiation of phase 1 for responder */
 static int
-isakmp_ph1begin_r(vchar_t *msg, struct sockaddr *remote, struct sockaddr *local, u_int8_t etype)
+isakmp_ph1begin_r(msg, remote, local, etype)
+	vchar_t *msg;
+	struct sockaddr *remote, *local;
+	u_int8_t etype;
 {
 	struct isakmp *isakmp = (struct isakmp *)msg->v;
 	struct ph1handle *iph1;
@@ -2183,7 +2186,7 @@ isakmp_post_acquire(iph2, iph1hint, nopassive)
 			"because of passive mode, "
 			"ignore the acquire message for %s.\n",
 			saddrwop2str(iph2->dst));
-		return 0;
+		return -1;
 	}
 
 	/*
@@ -2940,7 +2943,7 @@ copy_ph1addresses(iph1, rmconf, remote, local)
 		port = myaddr_getsport(iph1->local);
 		if (port == 0)
 			port = PORT_ISAKMP;
-		set_port(iph1->local, PORT_ISAKMP);
+		set_port(iph1->local, port);
 	}
 
 #ifdef ENABLE_NATT