From a747c093bbee95a3bdf1d7ef052bd248c95fadc5 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 1 Jun 2018 12:05:26 +0200
Subject: [PATCH] Modernise nsswitch.conf defaults (#1581809)

---
 nsswitch.conf | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/nsswitch.conf b/nsswitch.conf
index c3d3fb6..b49a3b2 100644
--- a/nsswitch.conf
+++ b/nsswitch.conf
@@ -15,37 +15,31 @@
 #	nisplus			Use NIS+ (NIS version 3)
 #	nis			Use NIS (NIS version 2), also called YP
 #	dns			Use DNS (Domain Name Service)
-#	files			Use the local files
-#	db			Use the local database (.db) files
-#	compat			Use NIS on compat mode
-#	hesiod			Use Hesiod for user lookups
+#	files			Use the local files in /etc
+#	db			Use the pre-processed /var/db files
+#	compat			Use /etc files plus *_compat pseudo-databases
+#	hesiod			Use Hesiod (DNS) for user lookups
+#	sss			Use sssd (System Security Services Daemon)
 #	[NOTFOUND=return]	Stop searching if not found so far
 #
+# 'sssd' performs its own 'files'-based caching, so it should
+# generally come before 'files'.
 
-# To use db, put the "db" in front of "files" for entries you want to be
-# looked up first in the databases
+# To use 'db', install the nss_db package, and put the 'db' in front
+# of 'files' for entries you want to be looked up first in the
+# databases, like this:
 #
-# Example:
-#passwd:    db files nisplus nis
-#shadow:    db files nisplus nis
-#group:     db files nisplus nis
+# passwd:    db files
+# shadow:    db files
+# group:     db files
 
 passwd:     sss files
 shadow:     files sss
 group:      sss files
 
-#hosts:     db files nisplus nis dns
-hosts:      files dns
+hosts:      files dns myhostname
 
-# Example - obey only what nisplus tells us...
-#services:   nisplus [NOTFOUND=return] files
-#networks:   nisplus [NOTFOUND=return] files
-#protocols:  nisplus [NOTFOUND=return] files
-#rpc:        nisplus [NOTFOUND=return] files
-#ethers:     nisplus [NOTFOUND=return] files
-#netmasks:   nisplus [NOTFOUND=return] files
-
-bootparams: nisplus [NOTFOUND=return] files
+bootparams: files
 
 ethers:     files
 netmasks:   files
@@ -54,9 +48,9 @@ protocols:  files
 rpc:        files
 services:   files sss
 
-netgroup:   nisplus sss
+netgroup:   sss
 
-publickey:  nisplus
+publickey:  files
 
-automount:  files nisplus
-aliases:    files nisplus
+automount:  files sss
+aliases:    files