From owner-svn-src-all@freebsd.org  Sun Oct 25 21:48:47 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35E6582F2;
 Sun, 25 Oct 2015 21:48:47 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC2B9107F;
 Sun, 25 Oct 2015 21:48:46 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9PLmkIA002291;
 Sun, 25 Oct 2015 21:48:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9PLmk60002290;
 Sun, 25 Oct 2015 21:48:46 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510252148.t9PLmk60002290@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 25 Oct 2015 21:48:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r289944 - stable/9/usr.bin/passwd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2015 21:48:47 -0000

Author: ngie
Date: Sun Oct 25 21:48:45 2015
New Revision: 289944
URL: https://svnweb.freebsd.org/changeset/base/289944

Log:
  MFC r243617 (to fix a longstanding bug):
  
  PR: 171779
  
  r243617 (by pjd):
  
  Respect NO_FSCHG and don't set 'schg' flag on passwd/yppasswd is defined.

Modified:
  stable/9/usr.bin/passwd/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/passwd/   (props changed)

Modified: stable/9/usr.bin/passwd/Makefile
==============================================================================
--- stable/9/usr.bin/passwd/Makefile	Sun Oct 25 21:39:23 2015	(r289943)
+++ stable/9/usr.bin/passwd/Makefile	Sun Oct 25 21:48:45 2015	(r289944)
@@ -19,7 +19,9 @@ beforeinstall:
 		chflags noschg ${DESTDIR}${BINDIR}/$i || true
 .endfor
 
+.if !defined(NO_FSCHG)
 afterinstall:
 	-chflags schg ${DESTDIR}${BINDIR}/passwd
+.endif
 
 .include <bsd.prog.mk>