From 53f8946416b456476d130334490790c3979d2f82 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 8 Mar 2018 17:14:42 +0100
Subject: [pam-slx-plug] Starting to separate some of the pam/nsswitch logic
 out of sssd/pam

Preparation for our own ldap/ad login handling, sssd will only be used for
nsswitch related stuff and fallback.
---
 .../systemd/system/sleep.target.wants/sssd-resume-fix.service |  1 -
 .../sssd/data/etc/systemd/system/sssd-resume-fix.service      | 11 -----------
 .../sssd/data/opt/openslx/scripts/systemd-patch_sssd_conf     |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 120000 core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service
 delete mode 100644 core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service

(limited to 'core/modules/sssd')

diff --git a/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service b/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service
deleted file mode 120000
index 3a96d5a9..00000000
--- a/core/modules/sssd/data/etc/systemd/system/sleep.target.wants/sssd-resume-fix.service
+++ /dev/null
@@ -1 +0,0 @@
-../sssd-resume-fix.service
\ No newline at end of file
diff --git a/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service b/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service
deleted file mode 100644
index bad4e4be..00000000
--- a/core/modules/sssd/data/etc/systemd/system/sssd-resume-fix.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Restart sssd after system resume to fix LDAP temporarily being unavailable
-DefaultDependencies=no
-After=systemd-suspend.service systemd-hybrid-sleep.service systemd-hibernate.service
-RefuseManualStart=true
-
-[Service]
-Type=oneshot
-ExecStart=/opt/openslx/scripts/systemd-sssd_restart
-RemainAfterExit=no
-
diff --git a/core/modules/sssd/data/opt/openslx/scripts/systemd-patch_sssd_conf b/core/modules/sssd/data/opt/openslx/scripts/systemd-patch_sssd_conf
index dfdfb6de..1992afef 100755
--- a/core/modules/sssd/data/opt/openslx/scripts/systemd-patch_sssd_conf
+++ b/core/modules/sssd/data/opt/openslx/scripts/systemd-patch_sssd_conf
@@ -1,6 +1,6 @@
 #!/bin/ash
 
-LIST="$(< /etc/passwd awk -F: '{printf $1 ","}')"
+LIST="$(< /etc/shadow awk -F: '{printf $1 ","}')"
 sed -i "s/^filter_users.*\$/filter_users = ${LIST%,}/g" /etc/sssd/sssd.conf
 
 LIST="$(< /etc/group awk -F: '{printf $1 ","}')"
-- 
cgit v1.2.3-55-g7522