diff options
| author | Jilles Tjoelker <jilles@FreeBSD.org> | 2009-05-30 10:42:19 +0000 |
|---|---|---|
| committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2009-05-30 10:42:19 +0000 |
| commit | 6911f596a1f53ba67b25ae4df2c5bddca6b29740 (patch) | |
| tree | 3dfefb2df35d23badced6800689e6082c7652801 /bin/rm | |
| parent | f2db75739c544582540c74d0db1c08a97967eca5 (diff) | |
| download | src-6911f596a1f53ba67b25ae4df2c5bddca6b29740.tar.gz src-6911f596a1f53ba67b25ae4df2c5bddca6b29740.zip | |
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
Notes
Notes:
svn path=/head/; revision=193087
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.c | 6 |
1 files changed, 3 insertions, 3 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); |