From 045ce1073721e8209d8e52e40a8e4b2acb15b2be Mon Sep 17 00:00:00 2001
From: mcbride <>
Date: Sat, 9 Feb 2008 12:10:54 +0000
Subject: [PATCH] Add .ssh and authorized keys to /etc/skel, makes setting up
 new pubkey authentication users with the correct file permissions a bit
 easier.

ok djm krw henning miod and many others
---
 src/etc/Makefile          | 6 ++++--
 src/etc/mtree/4.4BSD.dist | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index bb947d76..4a653acc 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.259 2008/01/31 14:18:03 reyk Exp $
+#	$OpenBSD: Makefile,v 1.260 2008/02/09 12:10:53 mcbride Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -110,7 +110,9 @@ distribution-etc-root-var: distrib-dirs
 		${INSTALL} -c -o root -g wheel -m 644 dot.mailrc \
 		    ${DESTDIR}/etc/skel/.mailrc; \
 		${INSTALL} -c -o root -g wheel -m 644 dot.profile \
-		    ${DESTDIR}/etc/skel/.profile
+		    ${DESTDIR}/etc/skel/.profile; \
+		${INSTALL} -c -o root -g wheel -m 600 /dev/null \
+		    ${DESTDIR}/etc/skel/.ssh/authorized_keys
 	cd kerberosV; \
 		${INSTALL} -c -o root -g wheel -m 644 README \
 		    ${DESTDIR}/etc/kerberosV; \
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 77ba5151..04d67f6f 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.190 2008/01/31 22:44:40 henning Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.191 2008/02/09 12:10:54 mcbride Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -132,6 +132,12 @@ ppp
 
 # ./etc/skel
 skel
+
+# ./etc/skel/.ssh
+.ssh		uname=root mode=0700
+# ./etc/skel/.ssh
+..
+
 # ./etc/skel
 ..