From 9c9982ecc9257d52b56993f45f0ee172988fdb53 Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Fri, 28 Mar 2003 21:32:30 +0000
Subject: [PATCH] - no more /var/ssyslog (unused) - no more /var/spool/lpd (lpd
 uses /var/spool/output) - no more /var/preserve (old vi directory) - update
 docs to reflect this

help with systrace provos@
help and ok millert@
---
 src/etc/daily                 |  7 +------
 src/etc/mtree/4.4BSD.dist     | 17 +----------------
 src/etc/printcap              |  6 +++---
 src/etc/systrace/usr_sbin_lpd |  4 +++-
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/etc/daily b/src/etc/daily
index 933352e3..2687ec7f 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: daily,v 1.42 2003/02/08 10:19:30 pvalchev Exp $
+#	$OpenBSD: daily,v 1.43 2003/03/28 21:32:30 jmc Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@@ -46,11 +46,6 @@ fi
 #	    >/dev/null 2>&1; }
 #fi
 
-if [ -d /var/preserve -a ! -L /var/preserve ]; then
-	cd /var/preserve && {
-	find . ! -name . -mtime +7 -execdir rm -f -- {} \; ; }
-fi
-
 if [ -d /var/rwho -a ! -L /var/rwho ] ; then
 	cd /var/rwho && {
 	find . ! -name . -mtime +7 -execdir rm -f -- {} \; ; }
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index f9df51c4..659c1aaf 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.149 2003/03/17 07:38:13 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.150 2003/03/28 21:32:30 jmc Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1911,11 +1911,6 @@ standard
 # ./var/obj				XXX
 #..
 
-# ./var/preserve
-preserve
-# ./var/preserve
-..
-
 # ./var/quotas
 quotas            gname=operator mode=0750
 # ./var/quotas
@@ -1970,11 +1965,6 @@ lock		uname=uucp gname=dialer mode=1775
 # ./var/spool/lock
 ..
 
-# ./var/spool/lpd
-lpd		gname=daemon mode=0775
-# ./var/spool/lpd
-..
-
 # ./var/spool/mqueue
 mqueue		mode=0700
 # ./var/spool/mqueue
@@ -2105,11 +2095,6 @@ users  type=dir uname=root gname=daemon mode=755
 #./www
 ..
 
-#./var/ssyslog
-ssyslog	type=dir uname=root gname=daemon mode=700
-#./var/ssyslog
-..
-
 #./var/audit
 audit type=dir uname=root gname=wheel mode=2770
 #./var/audit
diff --git a/src/etc/printcap b/src/etc/printcap
index 081e27de..27656bfc 100644
--- a/src/etc/printcap
+++ b/src/etc/printcap
@@ -1,7 +1,7 @@
-#	$OpenBSD: printcap,v 1.3 1999/09/23 01:31:20 deraadt Exp $
+#	$OpenBSD: printcap,v 1.4 2003/03/28 21:32:30 jmc Exp $
 
 #lp|local line printer:\
-#	:lp=/dev/lp:sd=/var/spool/lpd:lf=/var/log/lpd-errs:
+#	:lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
 
 #rp|remote line printer:\
-#	:lp=:rm=printhost:rp=lp:sd=/var/spool/lpd:lf=/var/log/lpd-errs:
+#	:lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
diff --git a/src/etc/systrace/usr_sbin_lpd b/src/etc/systrace/usr_sbin_lpd
index a17699f5..d54c2067 100644
--- a/src/etc/systrace/usr_sbin_lpd
+++ b/src/etc/systrace/usr_sbin_lpd
@@ -1,4 +1,4 @@
-# $OpenBSD: usr_sbin_lpd,v 1.3 2003/02/04 14:52:33 jakob Exp $
+# $OpenBSD: usr_sbin_lpd,v 1.4 2003/03/28 21:32:30 jmc Exp $
 #
 # Policy for lpd.
 # This policy works for the default configuration of lpd.
@@ -37,6 +37,7 @@ Policy: /usr/sbin/lpd, Emulation: native
 	native-fsread: filename match "/usr/share/nls/*" then permit
 	native-fsread: filename match "/usr/share/zoneinfo/*" then permit
 	native-fsread: filename match "/var/spool/lpd/*" then permit
+	native-fsread: filename match "/var/spool/output/*" then permit
 	native-fstat: permit
 	native-fstatfs: permit
 	native-fswrite: filename eq "/dev/console" then permit
@@ -45,6 +46,7 @@ Policy: /usr/sbin/lpd, Emulation: native
 	native-fswrite: filename eq "/var/run/lpd.pid" then permit
 	native-fswrite: filename eq "/var/run/printer" then permit
 	native-fswrite: filename match "/var/spool/lpd/*" then permit
+	native-fswrite: filename match "/var/spool/output/*" then permit
 	native-ftruncate: permit
 	native-getdirentries: permit
 	native-getegid: permit