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.

@@ -42,12 +42,14 @@
 # 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
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

@@ -884,12 +886,12 @@
                         return -1;
                 } else {
                         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);
                                 remph2(iph2);
                                 delph2(iph2);