[src/trunk]: src/sys/netkey Yet another NAT-T fix: don't forbid SP with ports...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/13f747704cdb
branches:  trunk
changeset: 580708:13f747704cdb
user:      manu <manu%NetBSD.org@localhost>
date:      Thu May 05 12:08:24 2005 +0000

description:
Yet another NAT-T fix: don't forbid SP with ports in the policy

diffstat:

 sys/netkey/key.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r b1062e33e5fa -r 13f747704cdb sys/netkey/key.c
--- a/sys/netkey/key.c  Thu May 05 02:20:45 2005 +0000
+++ b/sys/netkey/key.c  Thu May 05 12:08:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.132 2005/04/25 08:39:28 manu Exp $   */
+/*     $NetBSD: key.c,v 1.133 2005/05/05 12:08:24 manu Exp $   */
 /*     $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $   */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.132 2005/04/25 08:39:28 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.133 2005/05/05 12:08:24 manu Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1772,6 +1772,7 @@
 #endif
 
        for (isr = newsp->req; isr; isr = isr->next) {
+#ifndef IPSEC_NAT_T
                struct sockaddr *sa;
 
                /*
@@ -1813,6 +1814,7 @@
                                break;
                        }
                }
+#endif /* !IPSEC_NAT_T */
        }
 
        /*