00db10
Partial backport of the following Fedora Rawhide patches:
00db10
    
00db10
commit a747c093bbee95a3bdf1d7ef052bd248c95fadc5
00db10
Author: Florian Weimer <fweimer@redhat.com>
00db10
Date:   Fri Jun 1 12:05:26 2018 +0200
00db10
    
00db10
    Modernise nsswitch.conf defaults (#1581809)
00db10
    
00db10
(backported the line which adds sss description).
00db10
    
00db10
commit 82a97343d6405772541d754aeb4bab79612bd839
00db10
Author: Carlos O'Donell <carlos@redhat.com>
00db10
Date:   Thu Feb 7 17:15:12 2019 -0500
00db10
    
00db10
    Add warnings and notes to /etc/nsswitch.conf and /etc/nscd.conf.
00db10
    
00db10
(backported fully with adjustments for releng/nsswitch.conf).
00db10
00db10
diff --git a/nscd/nscd.conf b/nscd/nscd.conf
00db10
index 3730835c50a349c4..d7c0ee590466b0d4 100644
00db10
--- a/nscd/nscd.conf
00db10
+++ b/nscd/nscd.conf
00db10
@@ -3,6 +3,9 @@
00db10
 #
00db10
 # An example Name Service Cache config file.  This file is needed by nscd.
00db10
 #
00db10
+# WARNING: Running nscd with a secondary caching service like sssd may lead to
00db10
+#          unexpected behaviour, especially with how long entries are cached.
00db10
+#
00db10
 # Legal entries are:
00db10
 #
00db10
 #	logfile			<file>
00db10
@@ -22,7 +25,12 @@
00db10
 #       suggested-size		<service> <prime number>
00db10
 #	check-files		<service> <yes|no>
00db10
 #	persistent		<service> <yes|no>
00db10
+#
00db10
 #	shared			<service> <yes|no>
00db10
+#	NOTE: Setting 'shared' to a value of 'yes' will accelerate the lookup
00db10
+#	      with the help of the client, but these lookups will not be
00db10
+#	      counted as cache hits i.e. 'nscd -g' may show '0%'.
00db10
+#
00db10
 #	max-db-size		<service> <number bytes>
00db10
 #	auto-propagate		<service> <yes|no>
00db10
 #
00db10
diff --git a/releng/nsswitch.conf b/releng/nsswitch.conf
00db10
index 0a02e5717d906387..4b120bf9e6f94e5f 100644
00db10
--- a/releng/nsswitch.conf
00db10
+++ b/releng/nsswitch.conf
00db10
@@ -19,8 +19,11 @@
00db10
 #	db			Use the local database (.db) files
00db10
 #	compat			Use NIS on compat mode
00db10
 #	hesiod			Use Hesiod for user lookups
00db10
+#	sss			Use sssd (System Security Services Daemon)
00db10
 #	[NOTFOUND=return]	Stop searching if not found so far
00db10
 #
00db10
+# WARNING: Running nscd with a secondary caching service like sssd may lead to
00db10
+# 	   unexpected behaviour, especially with how long entries are cached.
00db10
 
00db10
 # To use db, put the "db" in front of "files" for entries you want to be
00db10
 # looked up first in the databases