From 6911f596a1f53ba67b25ae4df2c5bddca6b29740 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sat, 30 May 2009 10:42:19 +0000 Subject: [PATCH] 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 --- bin/rm/rm.c | 6 +++--- usr.bin/find/function.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/rm/rm.c b/bin/rm/rm.c index f9316bcacab6..d9bd296f50e1 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -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); diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index 26412644ff46..bfa0a36a9c55 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -443,7 +443,7 @@ f_delete(PLAN *plan __unused, FTSENT *entry) 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 */