[src/trunk]: src correct handling of "unique" policy. bump version to 20020507

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

details:   https://anonhg.NetBSD.org/src/rev/f9bcede942c7
branches:  trunk
changeset: 526868:f9bcede942c7
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon May 13 02:10:34 2002 +0000

description:
correct handling of "unique" policy.  bump version to 20020507
(corresponds to filename in ftp://ftp.kame.net/pub/kame).

diffstat:

 crypto/dist/kame/racoon/isakmp_quick.c |   4 +++-
 crypto/dist/kame/racoon/proposal.c     |  12 +++++++++---
 usr.sbin/racoon/Makefile.inc           |   4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r 7f830fceb08e -r f9bcede942c7 crypto/dist/kame/racoon/isakmp_quick.c
--- a/crypto/dist/kame/racoon/isakmp_quick.c    Mon May 13 01:44:34 2002 +0000
+++ b/crypto/dist/kame/racoon/isakmp_quick.c    Mon May 13 02:10:34 2002 +0000
@@ -1,4 +1,4 @@
-/*     $KAME: isakmp_quick.c,v 1.92 2002/03/05 15:34:59 sakane Exp $   */
+/*     $KAME: isakmp_quick.c,v 1.93 2002/05/07 17:47:55 sakane Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -87,7 +87,9 @@
 static vchar_t *quick_ir1mx __P((struct ph2handle *, vchar_t *, vchar_t *));
 static int get_sainfo_r __P((struct ph2handle *));
 static int get_proposal_r __P((struct ph2handle *));
+#ifdef INET6
 static u_int32_t setscopeid __P((struct sockaddr *, struct sockaddr *));
+#endif
 
 /* %%%
  * Quick Mode
diff -r 7f830fceb08e -r f9bcede942c7 crypto/dist/kame/racoon/proposal.c
--- a/crypto/dist/kame/racoon/proposal.c        Mon May 13 01:44:34 2002 +0000
+++ b/crypto/dist/kame/racoon/proposal.c        Mon May 13 02:10:34 2002 +0000
@@ -1,4 +1,4 @@
-/*     $KAME: proposal.c,v 1.47 2002/04/16 04:10:23 sakane Exp $       */
+/*     $KAME: proposal.c,v 1.48 2002/05/07 09:32:50 sakane Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -983,7 +983,10 @@
                else
                        newpr->encmode = encmodesv;
 
-               newpr->reqid_out = req->saidx.reqid;
+               if (iph2->side == INITIATOR)
+                       newpr->reqid_out = req->saidx.reqid;
+               else
+                       newpr->reqid_in = req->saidx.reqid;
 
                if (set_satrnsbysainfo(newpr, iph2->sainfo) < 0) {
                        plog(LLV_ERROR, LOCATION, NULL,
@@ -1002,7 +1005,10 @@
                req = sp_sub->req;
                pr = newpp->head;
                while (req && pr) {
-                       pr->reqid_in = req->saidx.reqid;
+                       if (iph2->side == INITIATOR)
+                               pr->reqid_in = req->saidx.reqid;
+                       else
+                               pr->reqid_out = req->saidx.reqid;
                        pr = pr->next;
                        req = req->next;
                }
diff -r 7f830fceb08e -r f9bcede942c7 usr.sbin/racoon/Makefile.inc
--- a/usr.sbin/racoon/Makefile.inc      Mon May 13 01:44:34 2002 +0000
+++ b/usr.sbin/racoon/Makefile.inc      Mon May 13 02:10:34 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2002/04/26 02:25:15 itojun Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2002/05/13 02:10:35 itojun Exp $
 
 # point top of your KAME tree by ${KAMEROOT}
 LIBPFKEYSRCDIR=        ${.CURDIR}/../../../crypto/dist/kame/libipsec
@@ -15,6 +15,6 @@
 
 DBG=   -g
 
-PKGVERSION=    netbsd-20020426
+PKGVERSION=    netbsd-20020507
 
 .include "../Makefile.inc"