From owner-svn-src-head@FreeBSD.ORG  Sun May 24 15:27:26 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 374631065670;
	Sun, 24 May 2009 15:27:26 +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 25B4D8FC0A;
	Sun, 24 May 2009 15:27:26 +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 n4OFRQSL093299;
	Sun, 24 May 2009 15:27:26 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4OFRQMl093298;
	Sun, 24 May 2009 15:27:26 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <200905241527.n4OFRQMl093298@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 24 May 2009 15:27:26 +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: r192687 - head/bin/chflags
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2009 15:27:26 -0000

Author: jilles
Date: Sun May 24 15:27:25 2009
New Revision: 192687
URL: http://svn.freebsd.org/changeset/base/192687

Log:
  Fix chflags -h in various cases: do not use link target's flags as original.
  
  Patch slightly changed to align more with chmod.c.
  
  PR:		bin/131999
  Submitted by:	bde
  Approved by:	ed (mentor)
  MFC after:	3 weeks

Modified:
  head/bin/chflags/chflags.c

Modified: head/bin/chflags/chflags.c
==============================================================================
--- head/bin/chflags/chflags.c	Sun May 24 13:22:00 2009	(r192686)
+++ head/bin/chflags/chflags.c	Sun May 24 15:27:25 2009	(r192687)
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
 			fts_options |= FTS_LOGICAL;
 		}
 	} else
-		fts_options = FTS_LOGICAL;
+		fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
 
 	/* XXX: Why don't chflags and lchflags have compatible prototypes? */
 	if (hflag)