--- old/iked/ikev1/ipsec_doi.c	Fri Mar 27 12:09:54 2009
+++ new/iked/ikev1/ipsec_doi.c	Fri Mar 27 12:09:54 2009
@@ -43,10 +43,17 @@
 # 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
 
+#ifdef sun	/* XXX KEBE SAYS OpenSolaris */
+#define	IPSEC_ULPROTO_ANY 0
+#define	IPSEC_PORT_ANY 0
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -3035,7 +3042,8 @@
 
 	for (; pp; pp = pp->next) {
 		for (pr = pp->head; pr; pr = pr->next) {
-			if (pr->encmode != IPSECDOI_ATTR_ENC_MODE_TRNS)
+			if (pr->encmode != IPSECDOI_ATTR_ENC_MODE_TRNS &&
+			    pr->encmode != IPSECDOI_ATTR_ENC_MODE_UDPTRNS_RFC)
 				return 0;
 		}
 	}
@@ -3108,8 +3116,10 @@
 		return IPSECDOI_PROTO_IPSEC_AH;
 	case IPPROTO_ESP:
 		return IPSECDOI_PROTO_IPSEC_ESP;
+#ifndef sun	/* XXX KEBE SAYS OpenSolaris */
 	case IPPROTO_IPCOMP:
 		return IPSECDOI_PROTO_IPCOMP;
+#endif
 	}
 	return -1;	/* XXX */
 }
@@ -3123,8 +3133,10 @@
 		return IPPROTO_AH;
 	case IPSECDOI_PROTO_IPSEC_ESP:
 		return IPPROTO_ESP;
+#ifndef sun	/* XXX KEBE SAYS OpenSolaris */
 	case IPSECDOI_PROTO_IPCOMP:
 		return IPPROTO_IPCOMP;
+#endif
 	}
 	return -1;	/* XXX */
 }