From owner-svn-src-head@FreeBSD.ORG Sat May 30 10:42:19 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFCB7106564A; Sat, 30 May 2009 10:42:19 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9355C8FC13; Sat, 30 May 2009 10:42:19 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UAgJsA003841; Sat, 30 May 2009 10:42:19 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UAgJG5003839; Sat, 30 May 2009 10:42:19 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <200905301042.n4UAgJG5003839@svn.freebsd.org> From: Jilles Tjoelker Date: Sat, 30 May 2009 10:42:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193087 - in head: bin/rm usr.bin/find X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 10:42:20 -0000 Author: jilles Date: Sat May 30 10:42:19 2009 New Revision: 193087 URL: http://svn.freebsd.org/changeset/base/193087 Log: rm, find -delete: fix removing symlinks with uchg/uappnd set. Formerly, this tried to clear the flags on the symlink's target instead of the symlink itself. As before, this only happens for root or for the unlink(1) variant of rm. PR: bin/111226 (part of) Submitted by: Martin Kammerhofer Approved by: ed (mentor) MFC after: 3 weeks Modified: head/bin/rm/rm.c head/usr.bin/find/function.c Modified: head/bin/rm/rm.c ============================================================================== --- head/bin/rm/rm.c Sat May 30 10:36:14 2009 (r193086) +++ head/bin/rm/rm.c Sat May 30 10:42:19 2009 (r193087) @@ -234,7 +234,7 @@ rm_tree(char **argv) else if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && - chflags(p->fts_accpath, + lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0) goto err; continue; @@ -253,7 +253,7 @@ rm_tree(char **argv) if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(p->fts_accpath, + rval = lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { /* @@ -368,7 +368,7 @@ rm_file(char **argv) if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); + rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { if (S_ISWHT(sb.st_mode)) rval = undelete(f); Modified: head/usr.bin/find/function.c ============================================================================== --- head/usr.bin/find/function.c Sat May 30 10:36:14 2009 (r193086) +++ head/usr.bin/find/function.c Sat May 30 10:42:19 2009 (r193087) @@ -443,7 +443,7 @@ f_delete(PLAN *plan __unused, FTSENT *en if ((entry->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(entry->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && geteuid() == 0) - chflags(entry->fts_accpath, + lchflags(entry->fts_accpath, entry->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); /* rmdir directories, unlink everything else */