From d930be51f79715cb6f0df925fe08838109ff833b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 12 Dec 2013 14:44:30 +0100
Subject: [pam] add missing /etc/pam-script folder to basic pam module

---
 remote/modules/pam/data/etc/pam-script/pam_script_ses_close | 1 +
 remote/modules/pam/data/etc/pam-script/pam_script_ses_open  | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 remote/modules/pam/data/etc/pam-script/pam_script_ses_close
 create mode 120000 remote/modules/pam/data/etc/pam-script/pam_script_ses_open

(limited to 'remote/modules/pam/data')

diff --git a/remote/modules/pam/data/etc/pam-script/pam_script_ses_close b/remote/modules/pam/data/etc/pam-script/pam_script_ses_close
new file mode 120000
index 00000000..f3682056
--- /dev/null
+++ b/remote/modules/pam/data/etc/pam-script/pam_script_ses_close
@@ -0,0 +1 @@
+/opt/openslx/scripts/pam_script_ses_close
\ No newline at end of file
diff --git a/remote/modules/pam/data/etc/pam-script/pam_script_ses_open b/remote/modules/pam/data/etc/pam-script/pam_script_ses_open
new file mode 120000
index 00000000..4f5598e5
--- /dev/null
+++ b/remote/modules/pam/data/etc/pam-script/pam_script_ses_open
@@ -0,0 +1 @@
+/opt/openslx/scripts/pam_script_ses_open
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 20ce232c145199d32e9ee3b38367023caa2cf0bd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 19:08:04 +0100
Subject: [pam] Fix session cleanup after last logout: su/sudo would not create
 a new session with logind, so an active user session could have been killed

---
 remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'remote/modules/pam/data')

diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
index 535cd0d6..198d2efe 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
@@ -13,6 +13,10 @@ slxlog "session-close" "$PAM_USER logged out on $PAM_TTY"
 
 OPENSESSION=$(loginctl show-user "$PAM_USER" | grep "Sessions=" | cut -c 10-)
 SESSIONCOUNT=$(echo "$OPENSESSION" | wc -w)
+# When using su/sudo there is no session created, so count up by one
+if [ "x$PAM_SERVICE" = "xsu" -o "x$PAM_SERVICE" = "xsudo" ]; then
+	SESSIONCOUNT=$(( $SESSIONCOUNT + 1 ))
+fi
 
 if [ "$SESSIONCOUNT" = "1" ]; then
 	# last sessions, close all ghost user processes
-- 
cgit v1.2.3-55-g7522