From owner-svn-src-stable@FreeBSD.ORG  Mon Sep  5 11:08:34 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 872701065672;
	Mon,  5 Sep 2011 11:08:34 +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 75AE88FC23;
	Mon,  5 Sep 2011 11:08:34 +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 p85B8Ygt035325;
	Mon, 5 Sep 2011 11:08:34 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p85B8YTm035323;
	Mon, 5 Sep 2011 11:08:34 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201109051108.p85B8YTm035323@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 5 Sep 2011 11:08:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225395 - stable/8/etc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Sep 2011 11:08:34 -0000

Author: ed
Date: Mon Sep  5 11:08:33 2011
New Revision: 225395
URL: http://svn.freebsd.org/changeset/base/225395

Log:
  MFC r224659, r224674 and r224765:
  
    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.

Modified:
  stable/8/etc/Makefile
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/Makefile
==============================================================================
--- stable/8/etc/Makefile	Mon Sep  5 10:45:29 2011	(r225394)
+++ stable/8/etc/Makefile	Mon Sep  5 11:08:33 2011	(r225395)
@@ -252,6 +252,10 @@ distribution:
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
+.if ${MK_NIS} == "no"
+	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+		${DESTDIR}/etc/nsswitch.conf
+.endif
 
 distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/