From 2f61038186a498972cbd309f8b517a01d7f246d5 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Wed, 5 Nov 2014 17:07:59 +0000
Subject: [PATCH] When clearing /tmp, use "-maxdepth -1" instead of "-type d
 -prune". This is easier to understand and fixes a bug where the "-type d
 -prune" was misplaced as noticed by pirofti@.  OK deraadt@

---
 src/etc/rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index ac70196d..aa6aa039 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.442 2014/09/15 22:28:58 matthieu Exp $
+#	$OpenBSD: rc,v 1.443 2014/11/05 17:07:59 millert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -442,8 +442,8 @@ echo clearing /tmp
 # (not needed with mfs /tmp, but doesn't hurt there...)
 (cd /tmp && rm -rf [a-km-pr-zA-Z]*)
 (cd /tmp &&
-    find . ! -name . ! -name lost+found ! -name quota.user \
-	! -name quota.group -execdir rm -rf -- {} \; -type d -prune)
+    find . -maxdepth 1 ! -name . ! -name lost+found ! -name quota.user \
+	! -name quota.group -execdir rm -rf -- {} \;)
 
 setup_X_sockets