Current snapshot of OpenSolaris port.
Checkpoint
Checkpoint
Merge from parent.
Merge with WIDE update.
Pull from WIDE.
Pull from WIDE.
Checkpoint
Re-update.
blah
WIDE update
Update from WIDE.

@@ -41,14 +41,21 @@
 # include <netinet6/ipsec.h>
 #else
 # ifdef HAVE_NETIPSEC_IPSEC_H
 #  include <netipsec/ipsec.h>
 # else
+#  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>
 #include <string.h>
 #include <errno.h>

@@ -3033,11 +3040,12 @@
 {
         struct saproto *pr = NULL;
 
         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;
                 }
         }
 
         return 1;

@@ -3106,12 +3114,14 @@
         switch (proto) {
         case IPPROTO_AH:
                 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 */
 }
 
 int

@@ -3121,12 +3131,14 @@
         switch (proto) {
         case IPSECDOI_PROTO_IPSEC_AH:
                 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 */
 }
 
 /*