From owner-cvs-src@FreeBSD.ORG  Mon Dec  1 08:56:29 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DA93216A4CE; Mon,  1 Dec 2003 08:56:29 -0800 (PST)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7044643FEC; Mon,  1 Dec 2003 08:55:02 -0800 (PST)
	(envelope-from marck@rinet.ru)
Received: from localhost (localhost [127.0.0.1])
	by woozle.rinet.ru (8.12.10/8.12.10) with ESMTP id hB1Gt1B5071691;
	Mon, 1 Dec 2003 19:55:01 +0300 (MSK)
	(envelope-from marck@rinet.ru)
Date: Mon, 1 Dec 2003 19:55:01 +0300 (MSK)
From: Dmitry Morozovsky <marck@rinet.ru>
To: Nate Lawson <nate@root.org>
In-Reply-To: <20031201084533.H13221@root.org>
Message-ID: <20031201195318.O68895@woozle.rinet.ru>
References: <20031201163631.B160A16A557@hub.freebsd.org>
	<20031201084533.H13221@root.org>
X-NCC-RegID: ru.rinet
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@freebsd.org
cc: Mike Makonnen <mtm@freebsd.org>
cc: src-committers@freebsd.org
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src/etc/rc.d cleartmp
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2003 16:56:30 -0000

On Mon, 1 Dec 2003, Nate Lawson wrote:

NL> >   When clearing /tmp, X11 lock and temporary files are special.
NL> >   Remove them unconditionaly.
NL> >
NL> >   PR:             bin/59065
NL> >   Approved by:    re (scottl)
NL> >
NL> >   Revision  Changes    Path
NL> >   1.5       +13 -13    src/etc/rc.d/cleartmp
NL> >
NL> >  load_rc_config $name
NL> >  run_rc_command "$1"
NL> > +
NL> > +case ${OSTYPE} in
NL> > +FreeBSD)
NL> > +	# Remove X lock files, since they will prevent you from
NL> > +	# restarting X
NL> > +	#
NL> > +	rm -f /tmp/.X*-lock
NL> > +	rm -fr /tmp/.X11-unix
NL> > +	mkdir -m 1777 /tmp/.X11-unix
NL> > +	;;
NL> > +NetBSD)
NL> > +	;;
NL> > +esac
NL>
NL> How about .X[0-9]-lock instead of *?

Hmm... what about (rare, but possible) situation with symlink poisoning?

Maybe

find /tmp -name '.X[0-9]-lock -type f | xargs rm -f
[ -d /tmp/.X11-unix ] && rm -rf /tmp/.X11-unix
mkdir -m 1777 /tmp/.X11-unix

?

Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru ***
------------------------------------------------------------------------