From c64c4eb01723d493e046963030681c76d064cf70 Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Mon, 7 Jun 2010 14:15:27 +0000
Subject: [PATCH] switch iked pki files to /etc/iked, discussed with reyk.

---
 src/etc/mtree/4.4BSD.dist | 54 ++++++++++++++++++++++++++++++++++++++-
 src/etc/mtree/special     |  4 ++-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 41d19f5a..88ffb7b5 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.205 2010/06/05 17:29:14 martinh Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.206 2010/06/07 14:15:27 jsg Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -53,6 +53,58 @@ hotplug
 # ./etc/hotplug
 ..
 
+# ./etc/iked
+iked
+
+# ./etc/iked/ca
+ca
+# ./etc/iked/ca
+..
+
+# ./etc/iked/certs
+certs
+# ./etc/iked/certs
+..
+
+# ./etc/iked/crls
+crls
+# ./etc/iked/crls
+..
+
+# ./etc/iked/private
+private		uname=root mode=0700
+# ./etc/iked/private
+..
+
+# ./etc/iked/pubkeys
+pubkeys		uname=root mode=0755
+
+# ./etc/iked/pubkeys/fqdn
+fqdn		uname=root mode=0755
+# ./etc/iked/pubkeys/fqdn
+..
+
+# ./etc/iked/pubkeys/ipv4
+ipv4		uname=root mode=0755
+# ./etc/iked/pubkeys/ipv4
+..
+
+# ./etc/iked/pubkeys/ipv6
+ipv6		uname=root mode=0755
+# ./etc/iked/pubkeys/ipv6
+..
+
+# ./etc/iked/pubkeys/ufqdn
+ufqdn		uname=root mode=0755
+# ./etc/iked/pubkeys/ufqdn
+..
+
+# ./etc/iked/pubkeys
+..
+
+# ./etc/iked
+..
+
 # ./etc/isakmpd
 isakmpd
 
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index 0fc90195..3a140281 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.87 2010/06/07 10:09:05 reyk Exp $
+#	$OpenBSD: special,v 1.88 2010/06/07 14:15:27 jsg Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -34,6 +34,8 @@ group		type=file mode=0644 uname=root gname=wheel
 hostapd.conf	type=file mode=0600 uname=root gname=wheel
 hosts		type=file mode=0644 uname=root gname=wheel
 hosts.equiv	type=file mode=0600 uname=root gname=wheel optional
+iked		type=dir mode=0755 uname=root gname=wheel
+..	#iked
 iked.conf	type=file mode=0600 uname=root gname=wheel
 inetd.conf	type=file mode=0644 uname=root gname=wheel
 ipsec.conf	type=file mode=0600 uname=root gname=wheel