From owner-svn-src-head@FreeBSD.ORG  Sat Aug  6 09:16:53 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 96B2B106566B;
	Sat,  6 Aug 2011 09:16:53 +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 870618FC08;
	Sat,  6 Aug 2011 09:16:53 +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 p769GrFF043465;
	Sat, 6 Aug 2011 09:16:53 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p769Gr4A043462;
	Sat, 6 Aug 2011 09:16:53 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201108060916.p769Gr4A043462@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 6 Aug 2011 09:16:53 +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: r224674 - 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: Sat, 06 Aug 2011 09:16:53 -0000

Author: dougb
Date: Sat Aug  6 09:16:53 2011
New Revision: 224674
URL: http://svn.freebsd.org/changeset/base/224674

Log:
  Rather than edit the nsswitch.conf file based on ${MK_NIS} == "no"
  comment out the NIS _compat options by default, but leave them in
  the file for the convenience of users who want to enable it.
  
  Update the comment in the file accordingly.
  
  Reviewed by:	ed
  Approved by:	re (hrs)

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

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sat Aug  6 09:13:09 2011	(r224673)
+++ head/etc/Makefile	Sat Aug  6 09:16:53 2011	(r224674)
@@ -256,10 +256,6 @@ 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}/

Modified: head/etc/nsswitch.conf
==============================================================================
--- head/etc/nsswitch.conf	Sat Aug  6 09:13:09 2011	(r224673)
+++ head/etc/nsswitch.conf	Sat Aug  6 09:16:53 2011	(r224674)
@@ -1,15 +1,23 @@
 #
-# nsswitch.conf(5) - name service switch configuration file
 # $FreeBSD$
 #
-group: compat
-group_compat: nis
+# 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
+
 hosts: files dns
 networks: files
-passwd: compat
-passwd_compat: nis
 shells: files
-services: compat
-services_compat: nis
 protocols: files
 rpc: files