From 4b13eb9acc484ee147740e5ad85b5c440cb47a81 Mon Sep 17 00:00:00 2001 From: robinrosenberger Date: Sun, 28 Feb 2021 12:26:05 +0100 Subject: [PATCH] Typos and cosmetics, improved checks --- realmd-arch-helper.sh | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/realmd-arch-helper.sh b/realmd-arch-helper.sh index 45abf84..80155c7 100644 --- a/realmd-arch-helper.sh +++ b/realmd-arch-helper.sh @@ -20,19 +20,21 @@ session optional pam_sss.so EOF unset pam grep sssd-arch /etc/pam.d/system-auth > /dev/null && pam=1 -[ $pam ] && echo "SSSD for PAM already enabled" && exit 0 -sed -i '2 i session include sssd-arch' /etc/pam.d/system-auth -sed -i '2 i password include sssd-arch' /etc/pam.d/system-auth -sed -i '2 i auth include sssd-arch' /etc/pam.d/system-auth -echo Enabled SSSD in PAM +[ $pam ] && echo "SSSD for PAM already enabled" +[ ! $pam ] && sed -i '2 i session include sssd-arch' /etc/pam.d/system-auth +[ ! $pam ] && sed -i '2 i password include sssd-arch' /etc/pam.d/system-auth +[ ! $pam ] && sed -i '2 i auth include sssd-arch' /etc/pam.d/system-auth +grep sssd-arch /etc/pam.d/system-auth > /dev/null && pam=1 +[ $pam ] && echo Enabled SSSD in PAM unset nss -grep sss /etc/nsswitch.conf > /dev/null && pam=1 -[ $pam ] && echo SSSD already enables in NSS -sed -i '/passwd:/s/$/ sss/' /etc/nsswitch.conf -sed -i '/group:/s/$/ sss/' /etc/nsswitch.conf -sed -i '/shadow:/s/$/ sss/' /etc/nsswitch.conf -echo Enabled SSSD in NSS +grep sss /etc/nsswitch.conf > /dev/null && nss=1 +[ $nss ] && echo SSSD already enabled in NSS +[ ! $nss ] && sed -i '/passwd:/s/$/ sss/' /etc/nsswitch.conf +[ ! $nss ] && sed -i '/group:/s/$/ sss/' /etc/nsswitch.conf +[ ! $nss ] && sed -i '/shadow:/s/$/ sss/' /etc/nsswitch.conf +grep sss /etc/nsswitch.conf > /dev/null && nss=1 +[ $nss ] && echo Enabled SSSD in NSS ;; @@ -40,10 +42,6 @@ echo Enabled SSSD in NSS sed -i '/sssd-arch/d' /etc/pam.d/system-auth sed -i 's/sss//g' /etc/nsswitch.conf ;; ---enable-nss) -;; ---disable-nss) -;; *) cat << EOF