From 8a3fb5a72dbd78f8aac25c13672aae438c662dae Mon Sep 17 00:00:00 2001
From: millert <>
Date: Thu, 17 Mar 2005 18:16:52 +0000
Subject: [PATCH] Don't rmdir .ICE-unix from /tmp or /var/tmp either.  OK
 deraadt@

---
 src/etc/daily | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/etc/daily b/src/etc/daily
index 7ca121e3..3e98d054 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: daily,v 1.49 2005/03/16 18:29:58 millert Exp $
+#	$OpenBSD: daily,v 1.50 2005/03/17 18:16:52 millert Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@@ -26,18 +26,20 @@ echo ""
 echo "Removing scratch and junk files:"
 if [ -d /tmp -a ! -L /tmp ]; then
 	cd /tmp && {
-	find -x . \( -path './ssh-*' -o -path './.X11-unix' \) -prune -o \
-	    -type f -atime +3 -execdir rm -f -- {} \;
+	find -x . \
+	    \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
+	    -prune -o -type f -atime +3 -execdir rm -f -- {} \;
 	find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
-	    ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
+	    ! -path ./.ICE-unix ! -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' \) -prune -o \
-	    ! -type d -atime +7 -execdir rm -f -- {} \;
+	find -x . \
+	    \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
+	    -prune -o ! -type d -atime +7 -execdir rm -f -- {} \;
 	find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
-	    ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
+	    ! -path ./.ICE-unix ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
 fi
 
 # Additional junk directory cleanup would go like this: