Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Aug 2011 09:16:53 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r224674 - head/etc
Message-ID:  <201108060916.p769Gr4A043462@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108060916.p769Gr4A043462>