diff options
| author | Simon Rettberg | 2017-02-03 12:50:19 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-02-03 12:50:19 +0100 |
| commit | bb7d862ceb11d05eda7d6689a94721bc48b9ba55 (patch) | |
| tree | abd664242790ff289bd0d9486e6772c7392f15ed /core/modules/pam | |
| parent | [run-virt/dhcp-busybox] Get WINS server from upstream DHCP, pass on to VMs vi... (diff) | |
| download | mltk-bb7d862ceb11d05eda7d6689a94721bc48b9ba55.tar.gz mltk-bb7d862ceb11d05eda7d6689a94721bc48b9ba55.tar.xz mltk-bb7d862ceb11d05eda7d6689a94721bc48b9ba55.zip | |
[pam] Remove old ldap libs, add keyutils
Diffstat (limited to 'core/modules/pam')
| -rw-r--r-- | core/modules/pam/module.conf | 5 | ||||
| -rw-r--r-- | core/modules/pam/module.conf.ubuntu | 3 | ||||
| -rw-r--r-- | core/modules/pam/module.conf.ubuntu.14 | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/core/modules/pam/module.conf b/core/modules/pam/module.conf index 9d803f3b..ae4789b6 100644 --- a/core/modules/pam/module.conf +++ b/core/modules/pam/module.conf @@ -5,11 +5,14 @@ REQUIRED_BINARIES=" sslconnect unix_chkpwd cifs.upcall + mount.cifs + key.dns_resolver + keyctl + request-key " REQUIRED_LIBRARIES=" nsswitch static - umich_ldap libnfsidmap pam_script " diff --git a/core/modules/pam/module.conf.ubuntu b/core/modules/pam/module.conf.ubuntu index 7b2ceb50..b800cec6 100644 --- a/core/modules/pam/module.conf.ubuntu +++ b/core/modules/pam/module.conf.ubuntu @@ -11,6 +11,7 @@ REQUIRED_INSTALLED_PACKAGES=" libpam0g-dev cifs-utils libpam-modules-bin + keyutils " REQUIRED_CONTENT_PACKAGES=" libpam0g @@ -27,10 +28,10 @@ REQUIRED_CONTENT_PACKAGES=" nfs-common cifs-utils libpam-modules-bin + keyutils " REQUIRED_BINARIES+=" nwmsg - mount.cifs " REQUIRED_DIRECTORIES+=" $SYS_PAM_MODULES_PATH diff --git a/core/modules/pam/module.conf.ubuntu.14 b/core/modules/pam/module.conf.ubuntu.14 index 455be684..d9f3b68e 100644 --- a/core/modules/pam/module.conf.ubuntu.14 +++ b/core/modules/pam/module.conf.ubuntu.14 @@ -1,6 +1,4 @@ REQUIRED_INSTALLED_PACKAGES=" - libpam-ldap - libnss-ldapd krb5-user krb5-config libpam-krb5 @@ -11,14 +9,12 @@ REQUIRED_INSTALLED_PACKAGES=" libpam0g-dev cifs-utils libpam-modules-bin + keyutils " REQUIRED_CONTENT_PACKAGES=" libpam0g libpam-modules libpam-cap - libldap-2.4-2 - libpam-ldap - libnss-ldapd krb5-user krb5-config libpam-krb5 @@ -27,9 +23,7 @@ REQUIRED_CONTENT_PACKAGES=" nfs-common cifs-utils libpam-modules-bin -" -REQUIRED_BINARIES+=" - mount.cifs + keyutils " REQUIRED_DIRECTORIES+=" $SYS_PAM_MODULES_PATH |