--- old/iked/ikev1/isakmp_inf.c	Fri Mar 27 12:09:54 2009
+++ new/iked/ikev1/isakmp_inf.c	Fri Mar 27 12:09:54 2009
@@ -44,7 +44,9 @@
 # ifdef HAVE_NETIPSEC_IPSEC_H
 #  include <netipsec/ipsec.h>
 # else
-#  include <linux/ipsec.h>
+#  ifndef sun	/* XXX KEBE SAYS OpenSolaris */
+#    include <linux/ipsec.h>
+#  endif
 # endif
 #endif
 
@@ -886,8 +888,8 @@
 			iph2 = getph2bymsgid(iph1, msgid);
 			if (iph2 == NULL) {
 				plog(PLOG_PROTOERR, PLOGLOC, 0,
-					"unknown notify message, "
-					"no phase2 handle found.\n");
+				    "unknown notify message (%d), "
+				    "no phase2 handle found.\n", type);
 			} else {
 				/* delete ph2 */
 				unbindph12(iph2);