===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/daily,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- src/etc/daily	2014/07/02 13:39:41	1.81
+++ src/etc/daily	2014/11/17 18:19:08	1.82
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: daily,v 1.81 2014/07/02 13:39:41 sthen Exp $
+#	$OpenBSD: daily,v 1.82 2014/11/17 18:19:08 deraadt Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 # For local additions, create the file /etc/daily.local.
@@ -50,18 +50,7 @@
 	find -x . \
 	    \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
 		-o -path ./portslocks -o -path './tmux-*' \) \
-	    -prune -o -type f -atime +3 -execdir rm -f -- {} \; 2>/dev/null
-	find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
-	    ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
-	    -execdir rmdir -- {} \; >/dev/null 2>&1; }
-fi
-
-if [ -d /var/tmp -a ! -L /var/tmp ]; then
-	cd /var/tmp && {
-	find -x . \
-	    \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
-		-o -path ./portslocks -o -path './tmux-*' \) \
-	    -prune -o ! -type d -atime +7 -execdir rm -f -- {} \; 2>/dev/null
+	    -prune -o -type f -atime +7 -execdir rm -f -- {} \; 2>/dev/null
 	find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
 	    ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
 	    -execdir rmdir -- {} \; >/dev/null 2>&1; }