From owner-svn-src-all@FreeBSD.ORG  Fri Aug  5 17:33:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7369F106564A;
	Fri,  5 Aug 2011 17:33:12 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 64C268FC18;
	Fri,  5 Aug 2011 17:33:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p75HXCmT015028;
	Fri, 5 Aug 2011 17:33:12 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p75HXCrZ015026;
	Fri, 5 Aug 2011 17:33:12 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201108051733.p75HXCrZ015026@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 5 Aug 2011 17:33:12 +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: r224659 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2011 17:33:12 -0000

Author: ed
Date: Fri Aug  5 17:33:12 2011
New Revision: 224659
URL: http://svn.freebsd.org/changeset/base/224659

Log:
  Remove NIS entries from /etc/nsswitch.conf for WITHOUT_NIS.
  
  We already modify various configuration files in /etc based on build
  configuration. This is not done for nsswitch.conf right now when setting
  WITHOUT_NIS. This breaks various utilities, including crond, that depend
  on working databases.
  
  Approved by:	re (kib)
  MFC after:	1 month

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Fri Aug  5 17:15:46 2011	(r224658)
+++ head/etc/Makefile	Fri Aug  5 17:33:12 2011	(r224659)
@@ -256,6 +256,10 @@ distribution:
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
+.if ${MK_NIS} == "no"
+	sed -i "" -e '/_compat:/d' -e 's/compat/files/' \
+		${DESTDIR}/etc/nsswitch.conf
+.endif
 
 distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/