From 7fc03cd9fa9b8526002f154da47e2e7a0301f943 Mon Sep 17 00:00:00 2001
From: manu <manu@NetBSD.org>
Date: Mon, 21 Nov 2005 14:20:29 +0000
Subject: [PATCH] Merge ipsec-tools 0.6.3 import

---
 .../crypto/rijndael/rijndael-alg-fst.c        |  2 +-
 .../crypto/rijndael/rijndael-alg-fst.h        |  2 +-
 .../crypto/rijndael/rijndael-api-fst.c        |  2 +-
 .../crypto/rijndael/rijndael-api-fst.h        |  2 +-
 .../racoon/missing/crypto/rijndael/rijndael.h |  2 +-
 .../missing/crypto/rijndael/rijndael_local.h  |  2 +-
 .../src/racoon/missing/crypto/sha2/sha2.c     |  2 +-
 .../src/racoon/missing/crypto/sha2/sha2.h     |  2 +-
 crypto/dist/ipsec-tools/src/racoon/pfkey.h    |  2 +-
 .../ipsec-tools/src/racoon/plainrsa-gen.8     |  2 +-
 .../ipsec-tools/src/racoon/plainrsa-gen.c     |  2 +-
 crypto/dist/ipsec-tools/src/racoon/plog.c     |  2 +-
 crypto/dist/ipsec-tools/src/racoon/plog.h     |  2 +-
 crypto/dist/ipsec-tools/src/racoon/policy.c   |  2 +-
 crypto/dist/ipsec-tools/src/racoon/policy.h   |  2 +-
 crypto/dist/ipsec-tools/src/racoon/privsep.c  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/privsep.h  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/proposal.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/proposal.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/prsa_par.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/prsa_par.y |  2 +-
 crypto/dist/ipsec-tools/src/racoon/prsa_tok.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/prsa_tok.l |  2 +-
 crypto/dist/ipsec-tools/src/racoon/racoon.8   |  2 +-
 .../dist/ipsec-tools/src/racoon/racoon.conf.5 | 26 +++++++++++++--
 .../dist/ipsec-tools/src/racoon/racoonctl.8   |  2 +-
 .../dist/ipsec-tools/src/racoon/racoonctl.c   |  2 +-
 .../dist/ipsec-tools/src/racoon/racoonctl.h   |  2 +-
 .../dist/ipsec-tools/src/racoon/remoteconf.c  | 10 +++---
 .../dist/ipsec-tools/src/racoon/remoteconf.h  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/rsalist.c  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/rsalist.h  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/safefile.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/safefile.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/sainfo.c   |  2 +-
 crypto/dist/ipsec-tools/src/racoon/sainfo.h   |  2 +-
 crypto/dist/ipsec-tools/src/racoon/schedule.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/schedule.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/session.c  | 33 ++++++++++++++++++-
 crypto/dist/ipsec-tools/src/racoon/session.h  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/sockmisc.c |  4 +--
 crypto/dist/ipsec-tools/src/racoon/sockmisc.h |  4 +--
 crypto/dist/ipsec-tools/src/racoon/str2val.c  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/str2val.h  |  2 +-
 crypto/dist/ipsec-tools/src/racoon/strnames.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/strnames.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/throttle.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/throttle.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/var.h      |  2 +-
 crypto/dist/ipsec-tools/src/racoon/vendorid.c |  2 +-
 crypto/dist/ipsec-tools/src/racoon/vendorid.h |  2 +-
 crypto/dist/ipsec-tools/src/racoon/vmbuf.c    |  2 +-
 crypto/dist/ipsec-tools/src/racoon/vmbuf.h    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/extern.h   |  2 +-
 crypto/dist/ipsec-tools/src/setkey/parse.c    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/parse.h    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/parse.y    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/setkey.c   |  2 +-
 .../dist/ipsec-tools/src/setkey/test-pfkey.c  |  2 +-
 crypto/dist/ipsec-tools/src/setkey/token.c    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/token.l    |  2 +-
 crypto/dist/ipsec-tools/src/setkey/vchar.h    |  2 +-
 62 files changed, 121 insertions(+), 70 deletions(-)

diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c
index 3c77e3e65594..4cfad42d96a0 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-alg-fst.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael-alg-fst.c,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael-alg-fst.c,v 1.1.1.1 2001/08/08 09:56:23 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h
index bda83466904f..e7e98c07aac1 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-alg-fst.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-alg-fst.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael-alg-fst.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael-alg-fst.h,v 1.1.1.1 2001/08/08 09:56:23 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c
index da6ef79f9289..c6579b6bf660 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-api-fst.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael-api-fst.c,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael-api-fst.c,v 1.8 2002/11/18 23:32:54 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h
index 6d159af4fa7c..0f446992bd8f 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael-api-fst.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael-api-fst.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael-api-fst.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael-api-fst.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h
index 2ecbf3417efe..a31bb94ea4e8 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
index cb9369e360e8..66cf01a6fcb5 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/rijndael/rijndael_local.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rijndael_local.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: rijndael_local.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: rijndael_local.h,v 1.1.1.1 2001/08/08 09:56:27 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
index 7bc295e55cd3..f373e1a00d96 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.c,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: sha2.c,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /* Id: sha2.c,v 1.6 2004/09/21 14:35:25 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
index eb4e5e79704d..fdd6f2a5ba28 100644
--- a/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
+++ b/crypto/dist/ipsec-tools/src/racoon/missing/crypto/sha2/sha2.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: sha2.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: sha2.h,v 1.2 2001/08/08 22:09:27 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/pfkey.h b/crypto/dist/ipsec-tools/src/racoon/pfkey.h
index 3acb1ccf3862..a6b17bb9743d 100644
--- a/crypto/dist/ipsec-tools/src/racoon/pfkey.h
+++ b/crypto/dist/ipsec-tools/src/racoon/pfkey.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfkey.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: pfkey.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: pfkey.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8 b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
index 62210a3635d3..9bc2c7122c81 100644
--- a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
+++ b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: plainrsa-gen.8,v 1.9 2005/08/20 00:57:06 manu Exp $
+.\"	$NetBSD: plainrsa-gen.8,v 1.10 2005/11/21 14:20:29 manu Exp $
 .\"
 .\" Id: plainrsa-gen.8,v 1.2.10.1 2005/04/18 11:10:55 manubsd Exp
 .\"
diff --git a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
index 2568a9999a4a..86388be86ed6 100644
--- a/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
+++ b/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plainrsa-gen.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: plainrsa-gen.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: plainrsa-gen.c,v 1.4.8.2 2005/04/21 09:07:20 monas Exp */
 /*
diff --git a/crypto/dist/ipsec-tools/src/racoon/plog.c b/crypto/dist/ipsec-tools/src/racoon/plog.c
index ffbde5446745..13aee0afc242 100644
--- a/crypto/dist/ipsec-tools/src/racoon/plog.c
+++ b/crypto/dist/ipsec-tools/src/racoon/plog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plog.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: plog.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: plog.c,v 1.6 2004/07/12 20:15:08 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/plog.h b/crypto/dist/ipsec-tools/src/racoon/plog.h
index 25a94b687c70..865bb8c79393 100644
--- a/crypto/dist/ipsec-tools/src/racoon/plog.h
+++ b/crypto/dist/ipsec-tools/src/racoon/plog.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: plog.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: plog.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: plog.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/policy.c b/crypto/dist/ipsec-tools/src/racoon/policy.c
index d31a376fc28e..b30ba585cfd4 100644
--- a/crypto/dist/ipsec-tools/src/racoon/policy.c
+++ b/crypto/dist/ipsec-tools/src/racoon/policy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy.c,v 1.3 2005/10/14 14:01:34 manu Exp $	*/
+/*	$NetBSD: policy.c,v 1.4 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: policy.c,v 1.46 2001/11/16 04:08:10 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/policy.h b/crypto/dist/ipsec-tools/src/racoon/policy.h
index 6cc2ddb87c37..cb0fc7625e49 100644
--- a/crypto/dist/ipsec-tools/src/racoon/policy.h
+++ b/crypto/dist/ipsec-tools/src/racoon/policy.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: policy.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: policy.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: policy.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/privsep.c b/crypto/dist/ipsec-tools/src/racoon/privsep.c
index 48f6fed34cff..ece787789148 100644
--- a/crypto/dist/ipsec-tools/src/racoon/privsep.c
+++ b/crypto/dist/ipsec-tools/src/racoon/privsep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: privsep.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: privsep.c,v 1.5 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: privsep.c,v 1.6.2.7 2005/08/08 11:25:01 vanhu Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/privsep.h b/crypto/dist/ipsec-tools/src/racoon/privsep.h
index 3f3d3fac847b..6202c4c2f91f 100644
--- a/crypto/dist/ipsec-tools/src/racoon/privsep.h
+++ b/crypto/dist/ipsec-tools/src/racoon/privsep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: privsep.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: privsep.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: privsep.h,v 1.3 2005/02/10 02:02:56 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/proposal.c b/crypto/dist/ipsec-tools/src/racoon/proposal.c
index 66d8d89020e1..dd50256344b3 100644
--- a/crypto/dist/ipsec-tools/src/racoon/proposal.c
+++ b/crypto/dist/ipsec-tools/src/racoon/proposal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: proposal.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: proposal.c,v 1.6 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: proposal.c,v 1.13.8.5 2005/07/28 05:05:52 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/proposal.h b/crypto/dist/ipsec-tools/src/racoon/proposal.h
index 9cb0074a992d..a06aaf18de20 100644
--- a/crypto/dist/ipsec-tools/src/racoon/proposal.h
+++ b/crypto/dist/ipsec-tools/src/racoon/proposal.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: proposal.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: proposal.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: proposal.h,v 1.5.10.1 2005/05/12 19:34:10 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/prsa_par.c b/crypto/dist/ipsec-tools/src/racoon/prsa_par.c
index c9fbfb0581bc..a593c0ca8921 100644
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_par.c
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_par.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_par.c,v 1.1.1.1 2005/11/21 14:12:10 manu Exp $	*/
+/*	$NetBSD: prsa_par.c,v 1.2 2005/11/21 14:20:29 manu Exp $	*/
 
 
 /*  A Bison parser, made from ./prsa_par.y
diff --git a/crypto/dist/ipsec-tools/src/racoon/prsa_par.y b/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
index d36f7f20dd6c..ca456bed2ac6 100644
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_par.y
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_par.y,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: prsa_par.y,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: prsa_par.y,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/prsa_tok.c b/crypto/dist/ipsec-tools/src/racoon/prsa_tok.c
index 552796751b15..abfc53f5a55f 100644
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_tok.c
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_tok.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_tok.c,v 1.1.1.1 2005/11/21 14:12:10 manu Exp $	*/
+/*	$NetBSD: prsa_tok.c,v 1.2 2005/11/21 14:20:29 manu Exp $	*/
 
 #define yy_create_buffer prsa_create_buffer
 #define yy_delete_buffer prsa_delete_buffer
diff --git a/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l b/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l
index 42ad0213c6ab..1d4150b87f47 100644
--- a/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l
+++ b/crypto/dist/ipsec-tools/src/racoon/prsa_tok.l
@@ -1,4 +1,4 @@
-/*	$NetBSD: prsa_tok.l,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: prsa_tok.l,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: prsa_tok.l,v 1.2 2004/07/12 20:43:51 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoon.8 b/crypto/dist/ipsec-tools/src/racoon/racoon.8
index 487f335df55b..c5704f2145c1 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoon.8
+++ b/crypto/dist/ipsec-tools/src/racoon/racoon.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoon.8,v 1.8 2005/08/20 00:57:06 manu Exp $
+.\"	$NetBSD: racoon.8,v 1.9 2005/11/21 14:20:29 manu Exp $
 .\"
 .\" Id: racoon.8,v 1.3.10.1 2005/04/18 11:10:55 manubsd Exp
 .\"
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 b/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
index fd383c93ffe5..c5cfd5a311a4 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
+++ b/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
@@ -1,6 +1,6 @@
-.\"	$NetBSD: racoon.conf.5,v 1.23 2005/10/14 14:01:34 manu Exp $
+.\"	$NetBSD: racoon.conf.5,v 1.24 2005/11/21 14:20:29 manu Exp $
 .\"
-.\" Id: racoon.conf.5,v 1.41 2005/09/21 14:35:16 manubsd Exp
+.\" Id: racoon.conf.5,v 1.27.2.11 2005/11/06 17:18:26 monas Exp
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -203,12 +203,19 @@ The file is growing because
 .Xr racoon 8
 simply adds SAs to it.
 You should maintain the file manually.
-.It Ic path script Ar path
+.It Ic path script Ar path ;
 .Xr racoon 8
 will search this directory for scripts hooks.
 If you run with privilege separation,
 .Xr racoon 8
 will refuse to execute a script stored outside of this directory.
+.It Ic path pidfile Ar file ;
+specifies file where to store PID of process. If path starts with 
+.Ic / 
+it is treated as
+an absolute path, otherwise relative to VARRUN directory specified at
+compilation time. Default is 
+.Ic racoon.pid 
 .El
 .\"
 .Ss File Inclusion
@@ -807,6 +814,13 @@ are constructed like:
 .Pp
 or
 .Pp
+.Ic subnet Ar address
+.Bq Ic / Ar prefix
+.Bq Ic [ Ar port ]
+.Ar ul_proto
+.Pp
+or
+.Pp
 .Ar idtype Ar string
 .Pp
 It means exactly the content of ID payload.
@@ -815,6 +829,12 @@ For example, if you define 3ffe:501:4819::/48 as
 .Ar source_id .
 3ffe:501:4819:1000:/64 will not match.
 .Pp
+In case of longest prefix (selecting single host) 
+.Ar address
+instructs to send ID type of ADDRESS, while
+.Ar subnet
+instructs to send ID type of SUBNET. Otherwise these instructions are identical.
+.Pp
 .Bl -tag -width Ds -compact
 .\"
 .It Ic pfs_group Ar group ;
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoonctl.8 b/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
index c36d06679de9..61b818b3acbb 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoonctl.8,v 1.11 2005/08/20 00:57:06 manu Exp $
+.\"	$NetBSD: racoonctl.8,v 1.12 2005/11/21 14:20:29 manu Exp $
 .\"
 .\" Id: racoonctl.8,v 1.2.4.2 2005/04/18 11:10:55 manubsd Exp
 .\"
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoonctl.c b/crypto/dist/ipsec-tools/src/racoon/racoonctl.c
index ac78b3a083ee..e4548e545d8f 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.c
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: racoonctl.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: racoonctl.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	Id: racoonctl.c,v 1.2.2.1 2005/04/21 09:07:20 monas Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoonctl.h b/crypto/dist/ipsec-tools/src/racoon/racoonctl.h
index 4c29e5852dbf..42f446cf311c 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoonctl.h
+++ b/crypto/dist/ipsec-tools/src/racoon/racoonctl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: racoonctl.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: racoonctl.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: racoonctl.h,v 1.2 2004/12/30 11:08:32 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/remoteconf.c b/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
index 4acf71952733..6ac60efeff25 100644
--- a/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
+++ b/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
@@ -1,6 +1,6 @@
-/*	$NetBSD: remoteconf.c,v 1.5 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: remoteconf.c,v 1.6 2005/11/21 14:20:29 manu Exp $	*/
 
-/* Id: remoteconf.c,v 1.26.2.4 2005/05/20 00:37:41 manubsd Exp */
+/* Id: remoteconf.c,v 1.26.2.5 2005/11/06 17:18:26 monas Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -638,9 +638,9 @@ script_path_add(path)
 		}
 
 		new_path->v[0] = '\0';
-		(void)strncat(new_path->v, script_dir, len);
-		(void)strncat(new_path->v, "/", len);
-		(void)strncat(new_path->v, path->v, len);
+		(void)strlcat(new_path->v, script_dir, len);
+		(void)strlcat(new_path->v, "/", len);
+		(void)strlcat(new_path->v, path->v, len);
 
 		vfree(path);
 		path = new_path;
diff --git a/crypto/dist/ipsec-tools/src/racoon/remoteconf.h b/crypto/dist/ipsec-tools/src/racoon/remoteconf.h
index 2d5b83f011e8..c215c3aa57ee 100644
--- a/crypto/dist/ipsec-tools/src/racoon/remoteconf.h
+++ b/crypto/dist/ipsec-tools/src/racoon/remoteconf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: remoteconf.h,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: remoteconf.h,v 1.5 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: remoteconf.h,v 1.19.2.1 2005/05/20 00:37:42 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/rsalist.c b/crypto/dist/ipsec-tools/src/racoon/rsalist.c
index 10cc3620c17e..5ced1c80e43e 100644
--- a/crypto/dist/ipsec-tools/src/racoon/rsalist.c
+++ b/crypto/dist/ipsec-tools/src/racoon/rsalist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsalist.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: rsalist.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: rsalist.c,v 1.3 2004/11/08 12:04:23 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/rsalist.h b/crypto/dist/ipsec-tools/src/racoon/rsalist.h
index 5b2a9ef780ba..110119ff26a6 100644
--- a/crypto/dist/ipsec-tools/src/racoon/rsalist.h
+++ b/crypto/dist/ipsec-tools/src/racoon/rsalist.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rsalist.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: rsalist.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: rsalist.h,v 1.2 2004/07/12 20:43:51 ludvigm Exp */
 /*
diff --git a/crypto/dist/ipsec-tools/src/racoon/safefile.c b/crypto/dist/ipsec-tools/src/racoon/safefile.c
index 11def8a9c675..24a7b5e392f7 100644
--- a/crypto/dist/ipsec-tools/src/racoon/safefile.c
+++ b/crypto/dist/ipsec-tools/src/racoon/safefile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: safefile.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: safefile.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: safefile.c,v 1.5 2001/03/05 19:54:06 thorpej Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/safefile.h b/crypto/dist/ipsec-tools/src/racoon/safefile.h
index 637fa640f462..29d8f746f455 100644
--- a/crypto/dist/ipsec-tools/src/racoon/safefile.h
+++ b/crypto/dist/ipsec-tools/src/racoon/safefile.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: safefile.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: safefile.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: safefile.h,v 1.4 2004/07/12 18:32:12 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/sainfo.c b/crypto/dist/ipsec-tools/src/racoon/sainfo.c
index e6b59ca225c5..e4aa6dfb8331 100644
--- a/crypto/dist/ipsec-tools/src/racoon/sainfo.c
+++ b/crypto/dist/ipsec-tools/src/racoon/sainfo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sainfo.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: sainfo.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: sainfo.c,v 1.16 2003/06/27 07:32:39 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/sainfo.h b/crypto/dist/ipsec-tools/src/racoon/sainfo.h
index 46ae559342ff..a86dd10a6a92 100644
--- a/crypto/dist/ipsec-tools/src/racoon/sainfo.h
+++ b/crypto/dist/ipsec-tools/src/racoon/sainfo.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sainfo.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: sainfo.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: sainfo.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/schedule.c b/crypto/dist/ipsec-tools/src/racoon/schedule.c
index 726fa23c4232..e6214bcc2391 100644
--- a/crypto/dist/ipsec-tools/src/racoon/schedule.c
+++ b/crypto/dist/ipsec-tools/src/racoon/schedule.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: schedule.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: schedule.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: schedule.c,v 1.19 2001/11/05 10:53:19 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/schedule.h b/crypto/dist/ipsec-tools/src/racoon/schedule.h
index 523e750b2184..d82cf65c563e 100644
--- a/crypto/dist/ipsec-tools/src/racoon/schedule.h
+++ b/crypto/dist/ipsec-tools/src/racoon/schedule.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: schedule.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: schedule.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: schedule.h,v 1.4 2004/11/18 15:14:44 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/session.c b/crypto/dist/ipsec-tools/src/racoon/session.c
index 35d8dff02217..7f94967eb1f3 100644
--- a/crypto/dist/ipsec-tools/src/racoon/session.c
+++ b/crypto/dist/ipsec-tools/src/racoon/session.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: session.c,v 1.5 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $	*/
 
@@ -61,6 +61,8 @@
 #include <unistd.h>
 #endif
 #include <signal.h>
+#include <sys/stat.h>
+#include <paths.h>
 
 #include "libpfkey.h"
 
@@ -112,6 +114,9 @@ session(void)
 	struct timeval *timeout;
 	int error;
 	struct myaddrs *p;
+	char pid_file[MAXPATHLEN];
+	FILE *fp;
+	pid_t racoon_pid = 0;
 
 	/* initialize schedular */
 	sched_init();
@@ -138,6 +143,32 @@ session(void)
 		exit(1);
 
 	sigreq = 0;
+
+	/* write .pid file */
+	racoon_pid = getpid();
+	if (lcconf->pathinfo[LC_PATHTYPE_PIDFILE] == NULL) 
+		strlcpy(pid_file, _PATH_VARRUN "racoon.pid", MAXPATHLEN);
+	else if (lcconf->pathinfo[LC_PATHTYPE_PIDFILE][0] == '/') 
+		strlcpy(pid_file, lcconf->pathinfo[LC_PATHTYPE_PIDFILE], MAXPATHLEN);
+	else {
+		strlcat(pid_file, _PATH_VARRUN, MAXPATHLEN);
+		strlcat(pid_file, lcconf->pathinfo[LC_PATHTYPE_PIDFILE], MAXPATHLEN);
+	} 
+	fp = fopen(pid_file, "w");
+	if (fp) {
+		if (fchmod(fileno(fp),
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) == -1) {
+			syslog(LOG_ERR, "%s", strerror(errno));
+			fclose(fp);
+			exit(1);
+		}
+		fprintf(fp, "%ld\n", (long)racoon_pid);
+		fclose(fp);
+	} else {
+		plog(LLV_ERROR, LOCATION, NULL,
+			"cannot open %s", pid_file);
+	}
+
 	while (1) {
 		if (dying)
 			rfds = maskdying;
diff --git a/crypto/dist/ipsec-tools/src/racoon/session.h b/crypto/dist/ipsec-tools/src/racoon/session.h
index e3d432007620..aa5688bf8dc7 100644
--- a/crypto/dist/ipsec-tools/src/racoon/session.h
+++ b/crypto/dist/ipsec-tools/src/racoon/session.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: session.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: session.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/sockmisc.c b/crypto/dist/ipsec-tools/src/racoon/sockmisc.c
index 9b8f741d830d..bb52ffcfedbb 100644
--- a/crypto/dist/ipsec-tools/src/racoon/sockmisc.c
+++ b/crypto/dist/ipsec-tools/src/racoon/sockmisc.c
@@ -1,6 +1,6 @@
-/*	$NetBSD: sockmisc.c,v 1.3 2005/10/14 14:01:34 manu Exp $	*/
+/*	$NetBSD: sockmisc.c,v 1.4 2005/11/21 14:20:29 manu Exp $	*/
 
-/* Id: sockmisc.c,v 1.17.4.3 2005/06/29 13:01:29 manubsd Exp */
+/* Id: sockmisc.c,v 1.17.4.4 2005/10/04 09:54:27 manubsd Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/crypto/dist/ipsec-tools/src/racoon/sockmisc.h b/crypto/dist/ipsec-tools/src/racoon/sockmisc.h
index 3749a9c9b2b9..fe5154cdf7ce 100644
--- a/crypto/dist/ipsec-tools/src/racoon/sockmisc.h
+++ b/crypto/dist/ipsec-tools/src/racoon/sockmisc.h
@@ -1,6 +1,6 @@
-/*	$NetBSD: sockmisc.h,v 1.5 2005/10/14 14:01:34 manu Exp $	*/
+/*	$NetBSD: sockmisc.h,v 1.6 2005/11/21 14:20:29 manu Exp $	*/
 
-/* Id: sockmisc.h,v 1.5.10.3 2005/06/29 13:01:29 manubsd Exp */
+/* Id: sockmisc.h,v 1.5.10.4 2005/10/04 09:54:27 manubsd Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/crypto/dist/ipsec-tools/src/racoon/str2val.c b/crypto/dist/ipsec-tools/src/racoon/str2val.c
index 46e73ea581f5..fed5c95a45d9 100644
--- a/crypto/dist/ipsec-tools/src/racoon/str2val.c
+++ b/crypto/dist/ipsec-tools/src/racoon/str2val.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: str2val.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: str2val.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: str2val.c,v 1.11 2001/08/16 14:37:29 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/str2val.h b/crypto/dist/ipsec-tools/src/racoon/str2val.h
index a48f20ddf547..a59e71dc6c1b 100644
--- a/crypto/dist/ipsec-tools/src/racoon/str2val.h
+++ b/crypto/dist/ipsec-tools/src/racoon/str2val.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: str2val.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: str2val.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: str2val.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/strnames.c b/crypto/dist/ipsec-tools/src/racoon/strnames.c
index cb84c4f2e739..8874c0d7ba7c 100644
--- a/crypto/dist/ipsec-tools/src/racoon/strnames.c
+++ b/crypto/dist/ipsec-tools/src/racoon/strnames.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strnames.c,v 1.4 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: strnames.c,v 1.5 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: strnames.c,v 1.25 2003/11/13 10:53:26 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/strnames.h b/crypto/dist/ipsec-tools/src/racoon/strnames.h
index f289ffdfaef9..07e004407fe7 100644
--- a/crypto/dist/ipsec-tools/src/racoon/strnames.h
+++ b/crypto/dist/ipsec-tools/src/racoon/strnames.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: strnames.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: strnames.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: strnames.h,v 1.5 2004/07/12 20:37:13 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/throttle.c b/crypto/dist/ipsec-tools/src/racoon/throttle.c
index e44144b0dec2..978f1e362725 100644
--- a/crypto/dist/ipsec-tools/src/racoon/throttle.c
+++ b/crypto/dist/ipsec-tools/src/racoon/throttle.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: throttle.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: throttle.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: throttle.c,v 1.2 2004/11/30 07:40:13 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/throttle.h b/crypto/dist/ipsec-tools/src/racoon/throttle.h
index caeb0cb58754..9d5e6cd6bfec 100644
--- a/crypto/dist/ipsec-tools/src/racoon/throttle.h
+++ b/crypto/dist/ipsec-tools/src/racoon/throttle.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: throttle.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: throttle.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: throttle.h,v 1.1 2004/11/30 00:46:09 manubsd Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/var.h b/crypto/dist/ipsec-tools/src/racoon/var.h
index afd4b336975d..503435cd7cd8 100644
--- a/crypto/dist/ipsec-tools/src/racoon/var.h
+++ b/crypto/dist/ipsec-tools/src/racoon/var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: var.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: var.h,v 1.6 2004/11/20 16:16:59 monas Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/vendorid.c b/crypto/dist/ipsec-tools/src/racoon/vendorid.c
index 0c1dab3cf2f2..f83bc79fb647 100644
--- a/crypto/dist/ipsec-tools/src/racoon/vendorid.c
+++ b/crypto/dist/ipsec-tools/src/racoon/vendorid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vendorid.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: vendorid.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: vendorid.c,v 1.7 2005/01/29 16:34:25 vanhu Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/vendorid.h b/crypto/dist/ipsec-tools/src/racoon/vendorid.h
index 6fced37c9c4b..b6164bbf658e 100644
--- a/crypto/dist/ipsec-tools/src/racoon/vendorid.h
+++ b/crypto/dist/ipsec-tools/src/racoon/vendorid.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vendorid.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: vendorid.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: vendorid.h,v 1.10 2005/01/29 16:34:25 vanhu Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/vmbuf.c b/crypto/dist/ipsec-tools/src/racoon/vmbuf.c
index 167bfded6a0e..f99ba4e66f4c 100644
--- a/crypto/dist/ipsec-tools/src/racoon/vmbuf.c
+++ b/crypto/dist/ipsec-tools/src/racoon/vmbuf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmbuf.c,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: vmbuf.c,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /*	$KAME: vmbuf.c,v 1.11 2001/11/26 16:54:29 sakane Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/racoon/vmbuf.h b/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
index c3cc71210e97..77086541a8f6 100644
--- a/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
+++ b/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmbuf.h,v 1.2 2005/08/20 00:57:06 manu Exp $	*/
+/*	$NetBSD: vmbuf.h,v 1.3 2005/11/21 14:20:29 manu Exp $	*/
 
 /* Id: vmbuf.h,v 1.3 2004/06/11 16:00:17 ludvigm Exp */
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/extern.h b/crypto/dist/ipsec-tools/src/setkey/extern.h
index c47dadd4d2c8..e03dc87be504 100644
--- a/crypto/dist/ipsec-tools/src/setkey/extern.h
+++ b/crypto/dist/ipsec-tools/src/setkey/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: extern.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/parse.c b/crypto/dist/ipsec-tools/src/setkey/parse.c
index 287ed810142c..e5f13b39d6bc 100644
--- a/crypto/dist/ipsec-tools/src/setkey/parse.c
+++ b/crypto/dist/ipsec-tools/src/setkey/parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.1.1.1 2005/11/21 14:12:18 manu Exp $	*/
+/*	$NetBSD: parse.c,v 1.2 2005/11/21 14:20:36 manu Exp $	*/
 
 
 /*  A Bison parser, made from parse.y
diff --git a/crypto/dist/ipsec-tools/src/setkey/parse.h b/crypto/dist/ipsec-tools/src/setkey/parse.h
index ca87cf471fbc..1eb289a98e22 100644
--- a/crypto/dist/ipsec-tools/src/setkey/parse.h
+++ b/crypto/dist/ipsec-tools/src/setkey/parse.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.h,v 1.1.1.1 2005/11/21 14:12:18 manu Exp $	*/
+/*	$NetBSD: parse.h,v 1.2 2005/11/21 14:20:36 manu Exp $	*/
 
 typedef union {
 	int num;
diff --git a/crypto/dist/ipsec-tools/src/setkey/parse.y b/crypto/dist/ipsec-tools/src/setkey/parse.y
index 5945c16b2496..6d385fcbe70b 100644
--- a/crypto/dist/ipsec-tools/src/setkey/parse.y
+++ b/crypto/dist/ipsec-tools/src/setkey/parse.y
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.y,v 1.6 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: parse.y,v 1.7 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/setkey.c b/crypto/dist/ipsec-tools/src/setkey/setkey.c
index 0c02726a82b4..e7b787616a38 100644
--- a/crypto/dist/ipsec-tools/src/setkey/setkey.c
+++ b/crypto/dist/ipsec-tools/src/setkey/setkey.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setkey.c,v 1.8 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: setkey.c,v 1.9 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c b/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
index 9b822c619a34..ba1893776ea4 100644
--- a/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
+++ b/crypto/dist/ipsec-tools/src/setkey/test-pfkey.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: test-pfkey.c,v 1.4 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: test-pfkey.c,v 1.5 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/token.c b/crypto/dist/ipsec-tools/src/setkey/token.c
index fce59172112d..d739e06de9f1 100644
--- a/crypto/dist/ipsec-tools/src/setkey/token.c
+++ b/crypto/dist/ipsec-tools/src/setkey/token.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: token.c,v 1.1.1.1 2005/11/21 14:12:19 manu Exp $	*/
+/*	$NetBSD: token.c,v 1.2 2005/11/21 14:20:36 manu Exp $	*/
 
 /* A lexical scanner generated by flex */
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/token.l b/crypto/dist/ipsec-tools/src/setkey/token.l
index efac71b4fb85..ea10b6003205 100644
--- a/crypto/dist/ipsec-tools/src/setkey/token.l
+++ b/crypto/dist/ipsec-tools/src/setkey/token.l
@@ -1,4 +1,4 @@
-/*	$NetBSD: token.l,v 1.7 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: token.l,v 1.8 2005/11/21 14:20:36 manu Exp $	*/
 
 /*	$KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $	*/
 
diff --git a/crypto/dist/ipsec-tools/src/setkey/vchar.h b/crypto/dist/ipsec-tools/src/setkey/vchar.h
index 30ae54014efa..09324011de5f 100644
--- a/crypto/dist/ipsec-tools/src/setkey/vchar.h
+++ b/crypto/dist/ipsec-tools/src/setkey/vchar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vchar.h,v 1.2 2005/08/20 00:57:29 manu Exp $	*/
+/*	$NetBSD: vchar.h,v 1.3 2005/11/21 14:20:36 manu Exp $	*/
 
 /* Id: vchar.h,v 1.2 2004/06/07 09:18:47 ludvigm Exp */