bin/111226: commit references a PR

[dfilter service]

The following reply was made to PR bin/111226; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: bin/111226: commit references a PR
Date: Sat, 30 May 2009 10:42:31 +0000 (UTC)

 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 */
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"