src - OpenBSD base system

diff options


context:
space:
mode:

author	Reyk Floeter <reyk@cvs.openbsd.org>	2013-01-08 10:38:20 +0000
committer	Reyk Floeter <reyk@cvs.openbsd.org>	2013-01-08 10:38:20 +0000
commit	b8176ff2955056aa5199e773c991017ee7391b83 (patch)
tree	ebe6dfb2f0ca26cb1d755ec63a98d7171876cf71 /sbin
parent	2d7f7a10b73912727950aeee185ccd192f558d6d (diff)

Remove private CVS tag from an obsolete repository and bump copyright

to 2013 while I'm here... this is my way of saying "happy new year!".

Diffstat (limited to 'sbin')

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sbin/iked/iked.conf.5

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sbin/iked/ikev2_msg.c

-rw-r--r--

sbin/iked/ikev2_pld.c

-rw-r--r--

sbin/iked/imsg_util.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

30 files changed, 61 insertions, 86 deletions

diff --git a/sbin/iked/Makefile b/sbin/iked/Makefile
index 3e5935384dd..1d8a575865a 100644
--- a/sbin/iked/Makefile
+++ b/sbin/iked/Makefile

@@ -1,5 +1,4 @@

-# $OpenBSD: Makefile,v 1.7 2012/09/25 21:50:41 brad Exp $

-# $vantronix: Makefile,v 1.22 2010/06/02 12:22:58 reyk Exp $

+# $OpenBSD: Makefile,v 1.8 2013/01/08 10:38:19 reyk Exp $

PROG= iked

SRCS= ca.c chap_ms.c config.c control.c crypto.c dh.c \

diff --git a/sbin/iked/ca.c b/sbin/iked/ca.c
index d41befc5364..2b5d6e3c891 100644
--- a/sbin/iked/ca.c
+++ b/sbin/iked/ca.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: ca.c,v 1.20 2012/11/16 14:39:00 mikeb Exp $ */

-/* $vantronix: ca.c,v 1.29 2010/06/02 12:22:58 reyk Exp $ */

+/* $OpenBSD: ca.c,v 1.21 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/chap_ms.c b/sbin/iked/chap_ms.c
index 0957a830dc0..884c5fbbda4 100644
--- a/sbin/iked/chap_ms.c
+++ b/sbin/iked/chap_ms.c

@@ -1,9 +1,8 @@

-/* $OpenBSD: chap_ms.c,v 1.5 2012/12/15 23:17:01 reyk Exp $ */

-/* $vantronix: chap_ms.c,v 1.7 2010/06/02 12:22:58 reyk Exp $ */

+/* $OpenBSD: chap_ms.c,v 1.6 2013/01/08 10:38:19 reyk Exp $ */

diff --git a/sbin/iked/chap_ms.h b/sbin/iked/chap_ms.h
index 7b891e0f623..f06940c4fc5 100644
--- a/sbin/iked/chap_ms.h
+++ b/sbin/iked/chap_ms.h

@@ -1,8 +1,7 @@

-/* $OpenBSD: chap_ms.h,v 1.2 2012/09/18 12:07:59 reyk Exp $ */

-/* $vantronix: chap_ms.h,v 1.6 2010/05/19 09:37:00 reyk Exp $ */

+/* $OpenBSD: chap_ms.h,v 1.3 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/config.c b/sbin/iked/config.c
index 0d8d9f6476a..1e31083381e 100644
--- a/sbin/iked/config.c
+++ b/sbin/iked/config.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: config.c,v 1.18 2012/12/15 23:20:17 reyk Exp $ */

-/* $vantronix: config.c,v 1.30 2010/05/28 15:34:35 reyk Exp $ */

+/* $OpenBSD: config.c,v 1.19 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/control.c b/sbin/iked/control.c
index 619ceecb741..d4fa011d8b2 100644
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: control.c,v 1.9 2012/09/18 12:07:59 reyk Exp $ */

-/* $vantronix: control.c,v 1.4 2010/05/14 07:35:52 reyk Exp $ */

+/* $OpenBSD: control.c,v 1.10 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

diff --git a/sbin/iked/crypto.c b/sbin/iked/crypto.c
index 2ea501606b5..3f96c260972 100644
--- a/sbin/iked/crypto.c
+++ b/sbin/iked/crypto.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: crypto.c,v 1.8 2012/12/15 23:18:17 reyk Exp $ */

-/* $vantronix: crypto.c,v 1.18 2010/05/28 15:34:35 reyk Exp $ */

+/* $OpenBSD: crypto.c,v 1.9 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/dh.c b/sbin/iked/dh.c
index 9f8ea4d3ad9..de33d96803e 100644
--- a/sbin/iked/dh.c
+++ b/sbin/iked/dh.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: dh.c,v 1.9 2012/12/15 23:18:17 reyk Exp $ */

-/* $vantronix: dh.c,v 1.13 2010/05/28 15:34:35 reyk Exp $ */

+/* $OpenBSD: dh.c,v 1.10 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/dh.h b/sbin/iked/dh.h
index aacba40395b..d7b8ea805a5 100644
--- a/sbin/iked/dh.h
+++ b/sbin/iked/dh.h

@@ -1,8 +1,7 @@

-/* $OpenBSD: dh.h,v 1.4 2012/09/18 12:07:59 reyk Exp $ */

-/* $vantronix: dh.h,v 1.8 2010/06/02 12:22:58 reyk Exp $ */

+/* $OpenBSD: dh.h,v 1.5 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/eap.c b/sbin/iked/eap.c
index 00a8b12081b..8f85c158ea9 100644
--- a/sbin/iked/eap.c
+++ b/sbin/iked/eap.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: eap.c,v 1.7 2012/12/15 23:20:17 reyk Exp $ */

-/* $vantronix: eap.c,v 1.12 2010/05/31 11:30:08 reyk Exp $ */

+/* $OpenBSD: eap.c,v 1.8 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/eap.h b/sbin/iked/eap.h
index 48b747363a7..a8d158e7c7d 100644
--- a/sbin/iked/eap.h
+++ b/sbin/iked/eap.h

@@ -1,8 +1,7 @@

-/* $OpenBSD: eap.h,v 1.2 2012/09/18 12:07:59 reyk Exp $ */

-/* $vantronix: eap.h,v 1.6 2010/05/18 17:56:16 reyk Exp $ */

+/* $OpenBSD: eap.h,v 1.3 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/genmap.sh b/sbin/iked/genmap.sh
index 135deb0e7ef..685f42e1e15 100644
--- a/sbin/iked/genmap.sh
+++ b/sbin/iked/genmap.sh

@@ -1,7 +1,7 @@

#!/bin/sh

-# $OpenBSD: genmap.sh,v 1.5 2012/10/25 15:06:01 reyk Exp $

+# $OpenBSD: genmap.sh,v 1.6 2013/01/08 10:38:19 reyk Exp $

# Permission to use, copy, modify, and distribute this software for any

# purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/iked.8 b/sbin/iked/iked.8
index 1b56468e156..aa9593c307c 100644
--- a/sbin/iked/iked.8
+++ b/sbin/iked/iked.8

@@ -1,7 +1,6 @@

-.\" $OpenBSD: iked.8,v 1.12 2012/11/29 21:34:31 jmc Exp $

-.\" $vantronix: iked.8,v 1.5 2010/06/02 14:38:08 reyk Exp $

+.\" $OpenBSD: iked.8,v 1.13 2013/01/08 10:38:19 reyk Exp $

.\"

.\" Permission to use, copy, modify, and distribute this software for any

.\" purpose with or without fee is hereby granted, provided that the above

@@ -15,7 +14,7 @@

.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

.\"

-.Dd $Mdocdate: November 29 2012 $

+.Dd $Mdocdate: January 8 2013 $

.Dt IKED 8

.Os

.Sh NAME

diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index bb18e88815c..b897080680b 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: iked.c,v 1.15 2012/12/15 23:19:35 reyk Exp $ */

-/* $vantronix: iked.c,v 1.22 2010/06/02 14:43:30 reyk Exp $ */

+/* $OpenBSD: iked.c,v 1.16 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/iked.conf.5 b/sbin/iked/iked.conf.5
index b84d171bc6f..18ef85fb6f7 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5

@@ -1,7 +1,6 @@

-.\" $OpenBSD: iked.conf.5,v 1.20 2012/09/18 12:07:59 reyk Exp $

-.\" $vantronix: iked.conf.5,v 1.10 2010/06/03 16:13:40 reyk Exp $

+.\" $OpenBSD: iked.conf.5,v 1.21 2013/01/08 10:38:19 reyk Exp $

.\"

.\" Permission to use, copy, modify, and distribute this software for any

@@ -16,7 +15,7 @@

.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

.\"

-.Dd $Mdocdate: September 18 2012 $

+.Dd $Mdocdate: January 8 2013 $

.Dt IKED.CONF 5

.Os

.Sh NAME

diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h
index b0a8eba578b..b3a7604d8ce 100644
--- a/sbin/iked/iked.h
+++ b/sbin/iked/iked.h

@@ -1,8 +1,7 @@

-/* $OpenBSD: iked.h,v 1.55 2012/11/29 15:08:08 reyk Exp $ */

-/* $vantronix: iked.h,v 1.61 2010/06/03 07:57:33 reyk Exp $ */

+/* $OpenBSD: iked.h,v 1.56 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/ikev1.c b/sbin/iked/ikev1.c
index 4f4c828eabf..cbac04699f4 100644
--- a/sbin/iked/ikev1.c
+++ b/sbin/iked/ikev1.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: ikev1.c,v 1.11 2012/09/18 12:07:59 reyk Exp $ */

-/* $vantronix: ikev1.c,v 1.13 2010/05/28 15:34:35 reyk Exp $ */

+/* $OpenBSD: ikev1.c,v 1.12 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index c812f8f0cb5..0be8fffad6a 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: ikev2.c,v 1.80 2012/12/15 23:15:11 reyk Exp $ */

-/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */

+/* $OpenBSD: ikev2.c,v 1.81 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/ikev2.h b/sbin/iked/ikev2.h
index 613af796b93..d58a8a38791 100644
--- a/sbin/iked/ikev2.h
+++ b/sbin/iked/ikev2.h

@@ -1,7 +1,7 @@

-/* $OpenBSD: ikev2.h,v 1.10 2012/10/25 15:01:56 reyk Exp $ */

+/* $OpenBSD: ikev2.h,v 1.11 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/ikev2_msg.c b/sbin/iked/ikev2_msg.c
index a8fdfe3576d..63c8473e5a1 100644
--- a/sbin/iked/ikev2_msg.c
+++ b/sbin/iked/ikev2_msg.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: ikev2_msg.c,v 1.23 2012/12/15 23:20:17 reyk Exp $ */

-/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */

+/* $OpenBSD: ikev2_msg.c,v 1.24 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/ikev2_pld.c b/sbin/iked/ikev2_pld.c
index 2dbd69ebbea..de51de64227 100644
--- a/sbin/iked/ikev2_pld.c
+++ b/sbin/iked/ikev2_pld.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: ikev2_pld.c,v 1.29 2012/12/15 23:12:21 reyk Exp $ */

-/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */

+/* $OpenBSD: ikev2_pld.c,v 1.30 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/imsg_util.c b/sbin/iked/imsg_util.c
index 2691550e2be..c585e245435 100644
--- a/sbin/iked/imsg_util.c
+++ b/sbin/iked/imsg_util.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: imsg_util.c,v 1.5 2012/09/18 12:07:59 reyk Exp $ */

+/* $OpenBSD: imsg_util.c,v 1.6 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/log.c b/sbin/iked/log.c
index 8b303ef1682..1ee91648580 100644
--- a/sbin/iked/log.c
+++ b/sbin/iked/log.c

@@ -1,5 +1,4 @@

-/* $OpenBSD: log.c,v 1.2 2010/06/24 20:15:30 reyk Exp $ */

-/* $vantronix: log.c,v 1.4 2010/04/21 19:29:09 reyk Exp $ */

+/* $OpenBSD: log.c,v 1.3 2013/01/08 10:38:19 reyk Exp $ */

diff --git a/sbin/iked/parse.y b/sbin/iked/parse.y
index 4ee1f15b61b..23c57bb8ebf 100644
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y

@@ -1,8 +1,7 @@

-/* $OpenBSD: parse.y,v 1.28 2012/10/25 15:01:56 reyk Exp $ */

-/* $vantronix: parse.y,v 1.22 2010/06/03 11:08:34 reyk Exp $ */

+/* $OpenBSD: parse.y,v 1.29 2013/01/08 10:38:19 reyk Exp $ */

diff --git a/sbin/iked/pfkey.c b/sbin/iked/pfkey.c
index 0b8e77b870e..fe9b9d7b23c 100644
--- a/sbin/iked/pfkey.c
+++ b/sbin/iked/pfkey.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: pfkey.c,v 1.21 2012/11/29 15:08:08 reyk Exp $ */

-/* $vantronix: pfkey.c,v 1.11 2010/06/03 07:57:33 reyk Exp $ */

+/* $OpenBSD: pfkey.c,v 1.22 2013/01/08 10:38:19 reyk Exp $ */

diff --git a/sbin/iked/policy.c b/sbin/iked/policy.c
index 145d87062e1..b070c0e8cc7 100644
--- a/sbin/iked/policy.c
+++ b/sbin/iked/policy.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: policy.c,v 1.22 2012/12/15 23:12:21 reyk Exp $ */

-/* $vantronix: policy.c,v 1.29 2010/05/28 15:34:35 reyk Exp $ */

+/* $OpenBSD: policy.c,v 1.23 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

diff --git a/sbin/iked/proc.c b/sbin/iked/proc.c
index 12e33a4d758..835e6ee01d6 100644
--- a/sbin/iked/proc.c
+++ b/sbin/iked/proc.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: proc.c,v 1.7 2011/05/09 11:27:08 reyk Exp $ */

+/* $OpenBSD: proc.c,v 1.8 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

diff --git a/sbin/iked/timer.c b/sbin/iked/timer.c
index b2a2c69ea35..2ad7ef229a2 100644
--- a/sbin/iked/timer.c
+++ b/sbin/iked/timer.c

@@ -1,7 +1,7 @@

-/* $OpenBSD: timer.c,v 1.9 2012/09/18 12:07:59 reyk Exp $ */

+/* $OpenBSD: timer.c,v 1.10 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/types.h b/sbin/iked/types.h
index 8e708460659..d0de6e5953d 100644
--- a/sbin/iked/types.h
+++ b/sbin/iked/types.h

@@ -1,8 +1,7 @@

-/* $OpenBSD: types.h,v 1.16 2012/11/29 15:08:08 reyk Exp $ */

-/* $vantronix: types.h,v 1.24 2010/05/11 12:05:56 reyk Exp $ */

+/* $OpenBSD: types.h,v 1.17 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

diff --git a/sbin/iked/util.c b/sbin/iked/util.c
index 8cad9a023c0..824f326622c 100644
--- a/sbin/iked/util.c
+++ b/sbin/iked/util.c

@@ -1,8 +1,7 @@

-/* $OpenBSD: util.c,v 1.17 2012/12/04 02:24:47 deraadt Exp $ */

-/* $vantronix: util.c,v 1.39 2010/06/02 12:22:58 reyk Exp $ */

+/* $OpenBSD: util.c,v 1.18 2013/01/08 10:38:19 reyk Exp $ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above