From owner-svn-src-head@FreeBSD.ORG  Wed Aug 10 20:52:02 2011
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 733371065673;
	Wed, 10 Aug 2011 20:52:02 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6342F8FC15;
	Wed, 10 Aug 2011 20:52:02 +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 p7AKq2vQ060988;
	Wed, 10 Aug 2011 20:52:02 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7AKq2XS060985;
	Wed, 10 Aug 2011 20:52:02 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201108102052.p7AKq2XS060985@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 10 Aug 2011 20:52:02 +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: r224765 - head/etc
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: Wed, 10 Aug 2011 20:52:02 -0000

Author: dougb
Date: Wed Aug 10 20:52:02 2011
New Revision: 224765
URL: http://svn.freebsd.org/changeset/base/224765

Log:
  Revert r224760, and enhance the sed patterns from r224659 to comment out
  the _compat entries in the WITHOUT_NIS case rather then delete them.
  
  Approved by:	re (kib)

Modified:
  head/etc/Makefile
  head/etc/nsswitch.conf

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Aug 10 19:40:23 2011	(r224764)
+++ head/etc/Makefile	Wed Aug 10 20:52:02 2011	(r224765)
@@ -256,6 +256,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}/

Modified: head/etc/nsswitch.conf
==============================================================================
--- head/etc/nsswitch.conf	Wed Aug 10 19:40:23 2011	(r224764)
+++ head/etc/nsswitch.conf	Wed Aug 10 20:52:02 2011	(r224765)
@@ -1,23 +1,15 @@
 #
+# nsswitch.conf(5) - name service switch configuration file
 # $FreeBSD$
 #
-# To enable NIS the commented entries should replace their uncommented
-# equivalents.  See nsswitch.conf(5) for more information.
-#
-group: files
-#group_compat: nis
-#group: compat
-
-passwd: files
-#passwd_compat: nis
-#passwd: compat
-
-services: files
-#services_compat: nis
-#services: compat
-
+group: compat
+group_compat: nis
 hosts: files dns
 networks: files
+passwd: compat
+passwd_compat: nis
 shells: files
+services: compat
+services_compat: nis
 protocols: files
 rpc: files