summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-10-11 18:16:05 +0200
committerSimon Rettberg2016-10-11 18:16:05 +0200
commit06fecdc2fe6bc50515c25766ed650d295212cce2 (patch)
tree6531378c6317407491648da0d3ad091b7c435b28
parent[xscreensaver] Create .xscreensaver to disable fading and apply our own dpms ... (diff)
downloadtm-scripts-06fecdc2fe6bc50515c25766ed650d295212cce2.tar.gz
tm-scripts-06fecdc2fe6bc50515c25766ed650d295212cce2.tar.xz
tm-scripts-06fecdc2fe6bc50515c25766ed650d295212cce2.zip
[pam] Include unix_chkpwd binary, required for non-root auth via pam_unix
-rw-r--r--remote/modules/pam/module.conf1
-rw-r--r--remote/modules/pam/module.conf.ubuntu8
-rw-r--r--remote/modules/pam/module.conf.ubuntu.143
3 files changed, 5 insertions, 7 deletions
diff --git a/remote/modules/pam/module.conf b/remote/modules/pam/module.conf
index 4e2e01a1..4fe76253 100644
--- a/remote/modules/pam/module.conf
+++ b/remote/modules/pam/module.conf
@@ -3,6 +3,7 @@ REQUIRED_BINARIES="
rpc.gssd
rpc.idmapd
sslconnect
+ unix_chkpwd
"
REQUIRED_LIBRARIES="
nsswitch
diff --git a/remote/modules/pam/module.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu
index d675116c..7b2ceb50 100644
--- a/remote/modules/pam/module.conf.ubuntu
+++ b/remote/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/remote/modules/pam/module.conf.ubuntu.14 b/remote/modules/pam/module.conf.ubuntu.14
index 64ead96a..455be684 100644
--- a/remote/modules/pam/module.conf.ubuntu.14
+++ b/remote/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