From 4ba08126b1e99291a924d90855e3c1fc68b8188e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 29 Nov 2018 14:45:08 +0100
Subject: [PATCH] Adjust scriptlets to modify
 /etc/authselect/user-nsswitch.conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With input from Pavel Březina.

The guard in install scriptlet was borked. The grep call was supposed
to skip the sed call if the file already had correct contents. But the
condition was always true. Added by me in back in 37de5dfe280a4c5de273ffc ;(
---
 systemd.spec | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index c8012c9..ca26cfb 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -529,20 +529,33 @@ fi
 %post libs
 %{?ldconfig}
 
-if [ -f /etc/nsswitch.conf ] ; then
-        # sed-fu to add myhostanme to hosts line
-        grep -v -E -q '^hosts:.* myhostname' /etc/nsswitch.conf &&
+function mod_nss() {
+    if [ -f "$1" ] ; then
+        # sed-fu to add myhostname to hosts line
+        grep -E -q '^hosts:.* myhostname' "$1" ||
         sed -i.bak -e '
                 /^hosts:/ !b
                 /\<myhostname\>/ b
                 s/[[:blank:]]*$/ myhostname/
-                ' /etc/nsswitch.conf &>/dev/null || :
+                ' "$1" &>/dev/null || :
 
         # Add nss-systemd to passwd and group
-        grep -E -q '^(passwd|group):.* systemd' /etc/nsswitch.conf ||
+        grep -E -q '^(passwd|group):.* systemd' "$1" ||
         sed -i.bak -r -e '
                 s/^(passwd|group):(.*)/\1: \2 systemd/
-                ' /etc/nsswitch.conf &>/dev/null || :
+                ' "$1" &>/dev/null || :
+    fi
+}
+
+FILE="$(readlink /etc/nsswitch.conf || echo /etc/nsswitch.conf)"
+if [ "$FILE" = "/etc/authselect/nsswitch.conf" ]; then
+        mod_nss "/etc/authselect/user-nsswitch.conf"
+        authselect apply-changes &> /dev/null || :
+else
+        mod_nss "$FILE"
+        # also apply the same changes to user-nsswitch.conf to affect
+        # possible future authselect configuration
+        mod_nss "/etc/authselect/user-nsswitch.conf"
 fi
 
 # check if nobody or nfsnobody is defined
@@ -662,6 +675,11 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Thu Nov 29 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+- Adjust scriptlets to modify /etc/authselect/user-nsswitch.conf
+  (see https://github.com/pbrezina/authselect/issues/77)
+- Drop old scriptlets for nsswitch.conf modifications for nss-mymachines and nss-resolve
+
 * Sun Nov 18 2018 Alejandro Domínguez Muñoz <adomu@net-c.com> - 239-10.git9f3aed1
 - Remove link creation for rsyslog.service