merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)

5 files changed, 10 insertions, 7 deletions

diff --git a/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
index cd35a86b..e4a7c1b4 100755
--- a/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
+++ b/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
@@ -6,6 +6,8 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/o
 # can only work if script is run as root
 [ "x$(whoami)" = "xroot" ] || exit 0
 
+[ "x${PAM_SERVICE%greeter}" != "x${PAM_SERVICE}" ] && exit 0
+
 # NSA needs to know
 if [ "x$PAM_SERVICE" != "xsu" -a "x$PAM_SERVICE" != "xsudo" ]; then
 	. /opt/openslx/config
diff --git a/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 8ab34708..b918278e 100755
--- a/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/core/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -3,6 +3,9 @@
 # Needed as pam_script clears PATH
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
+# just exit for greeter sessions
+[ "x${PAM_SERVICE%greeter}" != "x${PAM_SERVICE}" ] && exit 0
+
 # NSA needs to know
 if [ "x$PAM_SERVICE" != "xsu" -a "x$PAM_SERVICE" != "xsudo" ]; then
 	. /opt/openslx/config
diff --git a/core/modules/pam/module.conf b/core/modules/pam/module.conf
index 4e2e01a1..4fe76253 100644
--- a/core/modules/pam/module.conf
+++ b/core/modules/pam/module.conf
@@ -3,6 +3,7 @@ REQUIRED_BINARIES="
 	rpc.gssd
 	rpc.idmapd
 	sslconnect
+	unix_chkpwd
 "
 REQUIRED_LIBRARIES="
 	nsswitch
diff --git a/core/modules/pam/module.conf.ubuntu b/core/modules/pam/module.conf.ubuntu
index d675116c..7b2ceb50 100644
--- a/core/modules/pam/module.conf.ubuntu
+++ b/core/modules/pam/module.conf.ubuntu
@@ -9,8 +9,8 @@ REQUIRED_INSTALLED_PACKAGES="
 	libnfsidmap2
 	nfs-common
 	libpam0g-dev
-	ncpfs
 	cifs-utils
+	libpam-modules-bin
 "
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
@@ -25,15 +25,11 @@ REQUIRED_CONTENT_PACKAGES="
 	ldap-utils
 	libnfsidmap2
 	nfs-common
-	ncpfs
 	cifs-utils
+	libpam-modules-bin
 "
 REQUIRED_BINARIES+="
 	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
 	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
diff --git a/core/modules/pam/module.conf.ubuntu.14 b/core/modules/pam/module.conf.ubuntu.14
index 64ead96a..455be684 100644
--- a/core/modules/pam/module.conf.ubuntu.14
+++ b/core/modules/pam/module.conf.ubuntu.14
@@ -1,4 +1,3 @@
-# TODO fix and re-add ncp support !
 REQUIRED_INSTALLED_PACKAGES="
 	libpam-ldap
 	libnss-ldapd
@@ -11,6 +10,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	nfs-common
 	libpam0g-dev
 	cifs-utils
+	libpam-modules-bin
 "
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
@@ -26,6 +26,7 @@ REQUIRED_CONTENT_PACKAGES="
 	libnfsidmap2
 	nfs-common
 	cifs-utils
+	libpam-modules-bin
 "
 REQUIRED_BINARIES+="
 	mount.cifs