summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2012-09-18 12:08:00 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2012-09-18 12:08:00 +0000
commit981d2db567dbe5248de6c8dff6d5715b4878eb6d (patch)
treef095e6563c9406d6a20f1178ec57a7d9876645bb
parent7653a636e4813a6daf049f4ebaff8a51a512493b (diff)
update email addresses to match reality.
sure jsg@ mikeb@
-rw-r--r--sbin/iked/ca.c4
-rw-r--r--sbin/iked/chap_ms.c4
-rw-r--r--sbin/iked/chap_ms.h4
-rw-r--r--sbin/iked/config.c4
-rw-r--r--sbin/iked/control.c4
-rw-r--r--sbin/iked/crypto.c4
-rw-r--r--sbin/iked/dh.c4
-rw-r--r--sbin/iked/dh.h4
-rw-r--r--sbin/iked/eap.c4
-rw-r--r--sbin/iked/eap.h4
-rw-r--r--sbin/iked/genmap.sh4
-rw-r--r--sbin/iked/iked.88
-rw-r--r--sbin/iked/iked.c4
-rw-r--r--sbin/iked/iked.conf.58
-rw-r--r--sbin/iked/iked.h4
-rw-r--r--sbin/iked/ikev1.c4
-rw-r--r--sbin/iked/ikev2.c4
-rw-r--r--sbin/iked/ikev2.h4
-rw-r--r--sbin/iked/ikev2_msg.c4
-rw-r--r--sbin/iked/ikev2_pld.c4
-rw-r--r--sbin/iked/imsg_util.c4
-rw-r--r--sbin/iked/parse.y4
-rw-r--r--sbin/iked/pfkey.c4
-rw-r--r--sbin/iked/policy.c4
-rw-r--r--sbin/iked/timer.c4
-rw-r--r--sbin/iked/types.h4
-rw-r--r--sbin/iked/util.c4
-rw-r--r--usr.sbin/ikectl/ikeca.c4
-rw-r--r--usr.sbin/ikectl/ikectl.810
-rw-r--r--usr.sbin/ikectl/ikectl.c4
-rw-r--r--usr.sbin/ikectl/parser.c4
-rw-r--r--usr.sbin/ikectl/parser.h4
32 files changed, 71 insertions, 71 deletions
diff --git a/sbin/iked/ca.c b/sbin/iked/ca.c
index f533653d98d..95dcb8c8b5a 100644
--- a/sbin/iked/ca.c
+++ b/sbin/iked/ca.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ca.c,v 1.17 2011/05/27 12:01:02 reyk Exp $ */
+/* $OpenBSD: ca.c,v 1.18 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ca.c,v 1.29 2010/06/02 12:22:58 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 2a5e5fb7f09..ed5a0e2fad5 100644
--- a/sbin/iked/chap_ms.c
+++ b/sbin/iked/chap_ms.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: chap_ms.c,v 1.2 2011/05/27 12:01:02 reyk Exp $ */
+/* $OpenBSD: chap_ms.c,v 1.3 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: chap_ms.c,v 1.7 2010/06/02 12:22:58 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 1997 - 2001 Brian Somers <brian@Awfulhak.org>
* Copyright (c) 1997 Gabor Kincses <gabor@acm.org>
* Copyright (c) 1995 Eric Rosenquist
diff --git a/sbin/iked/chap_ms.h b/sbin/iked/chap_ms.h
index 95a216c0335..7b891e0f623 100644
--- a/sbin/iked/chap_ms.h
+++ b/sbin/iked/chap_ms.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: chap_ms.h,v 1.1 2010/06/03 16:41:12 reyk Exp $ */
+/* $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 $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 51665c739e0..ccf0531d616 100644
--- a/sbin/iked/config.c
+++ b/sbin/iked/config.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: config.c,v 1.15 2012/07/02 13:03:24 mikeb Exp $ */
+/* $OpenBSD: config.c,v 1.16 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: config.c,v 1.30 2010/05/28 15:34:35 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 8d3dc4d8231..619ceecb741 100644
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: control.c,v 1.8 2012/04/05 17:31:36 deraadt Exp $ */
+/* $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 $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/sbin/iked/crypto.c b/sbin/iked/crypto.c
index 9f4e992dbfb..8a064f399da 100644
--- a/sbin/iked/crypto.c
+++ b/sbin/iked/crypto.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: crypto.c,v 1.6 2011/08/27 16:29:20 mikeb Exp $ */
+/* $OpenBSD: crypto.c,v 1.7 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: crypto.c,v 1.18 2010/05/28 15:34:35 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 ae7d638c6e6..15f8dd50e22 100644
--- a/sbin/iked/dh.c
+++ b/sbin/iked/dh.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: dh.c,v 1.7 2012/06/04 09:14:29 mikeb Exp $ */
+/* $OpenBSD: dh.c,v 1.8 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: dh.c,v 1.13 2010/05/28 15:34:35 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 efec0afc5dc..aacba40395b 100644
--- a/sbin/iked/dh.h
+++ b/sbin/iked/dh.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: dh.h,v 1.3 2010/06/23 11:26:13 reyk Exp $ */
+/* $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 $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 98b05e06d1d..dec066a0740 100644
--- a/sbin/iked/eap.c
+++ b/sbin/iked/eap.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: eap.c,v 1.5 2011/05/27 12:01:02 reyk Exp $ */
+/* $OpenBSD: eap.c,v 1.6 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: eap.c,v 1.12 2010/05/31 11:30:08 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 138eb809e42..48b747363a7 100644
--- a/sbin/iked/eap.h
+++ b/sbin/iked/eap.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: eap.h,v 1.1 2010/06/03 16:41:12 reyk Exp $ */
+/* $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 $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 03a65fc2fea..caaf34425c4 100644
--- a/sbin/iked/genmap.sh
+++ b/sbin/iked/genmap.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# $OpenBSD: genmap.sh,v 1.2 2012/05/07 14:17:02 mikeb Exp $
+# $OpenBSD: genmap.sh,v 1.3 2012/09/18 12:07:59 reyk Exp $
-# Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+# Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
#
# 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 11e149551e5..233dc4b4873 100644
--- a/sbin/iked/iked.8
+++ b/sbin/iked/iked.8
@@ -1,7 +1,7 @@
-.\" $OpenBSD: iked.8,v 1.6 2010/12/22 17:30:13 mikeb Exp $
+.\" $OpenBSD: iked.8,v 1.7 2012/09/18 12:07:59 reyk Exp $
.\" $vantronix: iked.8,v 1.5 2010/06/02 14:38:08 reyk Exp $
.\"
-.\" Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+.\" Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
.\"
.\" 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 +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: December 22 2010 $
+.Dd $Mdocdate: September 18 2012 $
.Dt IKED 8
.Os
.Sh NAME
@@ -139,7 +139,7 @@ program first appeared in
The
.Nm
program was written by
-.An Reyk Floeter Aq reyk@vantronix.net .
+.An Reyk Floeter Aq reyk@openbsd.org .
.Sh CAVEATS
.Nm
is not yet finished and is missing some important security features.
diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index 17e1362be90..e225652ac21 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: iked.c,v 1.11 2011/05/09 11:15:18 reyk Exp $ */
+/* $OpenBSD: iked.c,v 1.12 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: iked.c,v 1.22 2010/06/02 14:43:30 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 d7a410a2ecc..b84d171bc6f 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5
@@ -1,7 +1,7 @@
-.\" $OpenBSD: iked.conf.5,v 1.19 2012/06/30 14:51:31 naddy Exp $
+.\" $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 $
.\"
-.\" Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+.\" Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,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: June 30 2012 $
+.Dd $Mdocdate: September 18 2012 $
.Dt IKED.CONF 5
.Os
.Sh NAME
@@ -847,4 +847,4 @@ file format first appeared in
The
.Nm
program was written by
-.An Reyk Floeter Aq reyk@vantronix.net .
+.An Reyk Floeter Aq reyk@openbsd.org .
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h
index 7cc747b5dc9..eff1bc27498 100644
--- a/sbin/iked/iked.h
+++ b/sbin/iked/iked.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: iked.h,v 1.52 2012/07/02 13:03:24 mikeb Exp $ */
+/* $OpenBSD: iked.h,v 1.53 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: iked.h,v 1.61 2010/06/03 07:57:33 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 c4df0d8e2dc..4f4c828eabf 100644
--- a/sbin/iked/ikev1.c
+++ b/sbin/iked/ikev1.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikev1.c,v 1.10 2011/05/09 11:15:18 reyk Exp $ */
+/* $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 $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 045395d7542..f9e0f1cf856 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikev2.c,v 1.76 2012/07/05 08:37:22 mikeb Exp $ */
+/* $OpenBSD: ikev2.c,v 1.77 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 4187cd03f3b..218f4b8d0b9 100644
--- a/sbin/iked/ikev2.h
+++ b/sbin/iked/ikev2.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikev2.h,v 1.8 2012/06/29 15:05:49 mikeb Exp $ */
+/* $OpenBSD: ikev2.h,v 1.9 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ikev2.h,v 1.27 2010/05/19 12:20:30 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 014e7947f19..7b1df69dfe2 100644
--- a/sbin/iked/ikev2_msg.c
+++ b/sbin/iked/ikev2_msg.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikev2_msg.c,v 1.20 2012/06/27 15:36:36 mikeb Exp $ */
+/* $OpenBSD: ikev2_msg.c,v 1.21 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 a374ce9fb6a..ccc76faa059 100644
--- a/sbin/iked/ikev2_pld.c
+++ b/sbin/iked/ikev2_pld.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikev2_pld.c,v 1.26 2012/06/22 16:06:31 mikeb Exp $ */
+/* $OpenBSD: ikev2_pld.c,v 1.27 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 36be7eea9ac..2691550e2be 100644
--- a/sbin/iked/imsg_util.c
+++ b/sbin/iked/imsg_util.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: imsg_util.c,v 1.4 2011/05/09 11:15:18 reyk Exp $ */
+/* $OpenBSD: imsg_util.c,v 1.5 2012/09/18 12:07:59 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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/parse.y b/sbin/iked/parse.y
index 1f55419dd88..2093ac1aedf 100644
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y
@@ -1,8 +1,8 @@
-/* $OpenBSD: parse.y,v 1.26 2012/06/30 14:51:31 naddy Exp $ */
+/* $OpenBSD: parse.y,v 1.27 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: parse.y,v 1.22 2010/06/03 11:08:34 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 2001 Markus Friedl. All rights reserved.
diff --git a/sbin/iked/pfkey.c b/sbin/iked/pfkey.c
index a82dae0ae0b..56f0867b93b 100644
--- a/sbin/iked/pfkey.c
+++ b/sbin/iked/pfkey.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: pfkey.c,v 1.18 2012/06/29 15:05:49 mikeb Exp $ */
+/* $OpenBSD: pfkey.c,v 1.19 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: pfkey.c,v 1.11 2010/06/03 07:57:33 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
* Copyright (c) 2003, 2004 Markus Friedl <markus@openbsd.org>
diff --git a/sbin/iked/policy.c b/sbin/iked/policy.c
index fe3aa1a0675..a7b19148fe6 100644
--- a/sbin/iked/policy.c
+++ b/sbin/iked/policy.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: policy.c,v 1.20 2012/05/30 09:39:35 mikeb Exp $ */
+/* $OpenBSD: policy.c,v 1.21 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: policy.c,v 1.29 2010/05/28 15:34:35 reyk Exp $ */
/*
- * Copyright (c) 2010, 2011 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010, 2011 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2001 Daniel Hartmeier
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/sbin/iked/timer.c b/sbin/iked/timer.c
index 74dc61b071e..b2a2c69ea35 100644
--- a/sbin/iked/timer.c
+++ b/sbin/iked/timer.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: timer.c,v 1.8 2012/06/22 16:06:31 mikeb Exp $ */
+/* $OpenBSD: timer.c,v 1.9 2012/09/18 12:07:59 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 eda50b79d3d..0124e2bc5de 100644
--- a/sbin/iked/types.h
+++ b/sbin/iked/types.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: types.h,v 1.11 2012/07/08 11:48:20 deraadt Exp $ */
+/* $OpenBSD: types.h,v 1.12 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: types.h,v 1.24 2010/05/11 12:05:56 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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 c7986f2e240..98514cf6899 100644
--- a/sbin/iked/util.c
+++ b/sbin/iked/util.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: util.c,v 1.15 2012/05/08 15:37:09 mikeb Exp $ */
+/* $OpenBSD: util.c,v 1.16 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: util.c,v 1.39 2010/06/02 12:22:58 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
*
* 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/usr.sbin/ikectl/ikeca.c b/usr.sbin/ikectl/ikeca.c
index e767fea9015..b500fbb22c2 100644
--- a/usr.sbin/ikectl/ikeca.c
+++ b/usr.sbin/ikectl/ikeca.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: ikeca.c,v 1.21 2012/07/08 11:48:20 deraadt Exp $ */
+/* $OpenBSD: ikeca.c,v 1.22 2012/09/18 12:07:59 reyk Exp $ */
/* $vantronix: ikeca.c,v 1.13 2010/06/03 15:52:52 reyk Exp $ */
/*
- * Copyright (c) 2010 Jonathan Gray <jsg@vantronix.net>
+ * Copyright (c) 2010 Jonathan Gray <jsg@openbsd.org>
*
* 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/usr.sbin/ikectl/ikectl.8 b/usr.sbin/ikectl/ikectl.8
index 1f82c10ea3a..1f58f755a54 100644
--- a/usr.sbin/ikectl/ikectl.8
+++ b/usr.sbin/ikectl/ikectl.8
@@ -1,7 +1,7 @@
-.\" $OpenBSD: ikectl.8,v 1.18 2011/01/20 13:58:16 jmc Exp $
+.\" $OpenBSD: ikectl.8,v 1.19 2012/09/18 12:07:59 reyk Exp $
.\" $vantronix: ikectl.8,v 1.11 2010/06/03 15:55:51 reyk Exp $
.\"
-.\" Copyright (c) 2007, 2008, 2009, 2010 Reyk Floeter <reyk@vantronix.net>
+.\" Copyright (c) 2007, 2008, 2009, 2010 Reyk Floeter <reyk@openbsd.org>
.\"
.\" 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 +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: January 20 2011 $
+.Dd $Mdocdate: September 18 2012 $
.Dt IKECTL 8
.Os
.Sh NAME
@@ -347,9 +347,9 @@ program first appeared in
The
.Nm
program was written by
-.An Reyk Floeter Aq reyk@vantronix.net
+.An Reyk Floeter Aq reyk@openbsd.org
and
-.An Jonathan Gray Aq jsg@vantronix.net .
+.An Jonathan Gray Aq jsg@openbsd.org .
.Sh CAVEATS
For ease of use, the
.Ic ca
diff --git a/usr.sbin/ikectl/ikectl.c b/usr.sbin/ikectl/ikectl.c
index 2980035c348..f2a37cb2471 100644
--- a/usr.sbin/ikectl/ikectl.c
+++ b/usr.sbin/ikectl/ikectl.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: ikectl.c,v 1.13 2012/05/02 18:01:25 gsoares Exp $ */
+/* $OpenBSD: ikectl.c,v 1.14 2012/09/18 12:07:59 reyk Exp $ */
/*
- * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
diff --git a/usr.sbin/ikectl/parser.c b/usr.sbin/ikectl/parser.c
index ed240dd3e54..a6e394f478a 100644
--- a/usr.sbin/ikectl/parser.c
+++ b/usr.sbin/ikectl/parser.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: parser.c,v 1.10 2011/05/27 12:01:02 reyk Exp $ */
+/* $OpenBSD: parser.c,v 1.11 2012/09/18 12:07:59 reyk Exp $ */
/*
- * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
*
diff --git a/usr.sbin/ikectl/parser.h b/usr.sbin/ikectl/parser.h
index afa70507eaf..7d905607c28 100644
--- a/usr.sbin/ikectl/parser.h
+++ b/usr.sbin/ikectl/parser.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: parser.h,v 1.10 2011/05/27 12:01:02 reyk Exp $ */
+/* $OpenBSD: parser.h,v 1.11 2012/09/18 12:07:59 reyk Exp $ */
/*
- * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
+ * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above