From 71cb0b71abda10e718af3643d50181ebee987765 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Sat, 5 Mar 2016 16:24:56 +0000
Subject: [PATCH] Change default lpd spool directory to match the code; from
 Chris Bennett Add /var/spool/output/lpd to mtree(1).

This removes the ability for the daemon group to write directly under
/var/spool/output; though no breakage is expected since this directory was only
supposed to contain line printer spooling directories.

ok sthen@
---
 src/etc/examples/printcap | 6 +++---
 src/etc/mtree/4.4BSD.dist | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/etc/examples/printcap b/src/etc/examples/printcap
index a63abc4e..87b5c497 100644
--- a/src/etc/examples/printcap
+++ b/src/etc/examples/printcap
@@ -1,7 +1,7 @@
-#	$OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $
+#	$OpenBSD: printcap,v 1.2 2016/03/05 16:24:56 ajacoutot Exp $
 
 #lp|local line printer:\
-#	:lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+#	:lp=/dev/lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
 
 #rp|remote line printer:\
-#	:lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+#	:lp=:rm=printhost:rp=lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 1f799232..0e10cf41 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.278 2016/01/06 23:28:47 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.279 2016/03/05 16:24:56 ajacoutot Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -757,7 +757,9 @@ var
         # ./var/spool/lock
         lock			uname=uucp gname=dialer mode=1775
         ..
-        output			gname=daemon mode=0775
+        output
+            lpd			gname=daemon mode=0775
+	    ..
         ..
         # ./var/spool/smtpd
         smtpd			type=dir uname=root gname=wheel mode=0711