diff options
| author | Jonathan Bauer | 2013-06-18 13:10:29 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-18 13:10:29 +0200 |
| commit | f5e7c73cdfc14dcf21193a8b22a611f34db815fe (patch) | |
| tree | 31972be32244452bd61e3208cc0dc627a05bd202 /remote/modules/pam | |
| parent | merge (diff) | |
| download | tm-scripts-f5e7c73cdfc14dcf21193a8b22a611f34db815fe.tar.gz tm-scripts-f5e7c73cdfc14dcf21193a8b22a611f34db815fe.tar.xz tm-scripts-f5e7c73cdfc14dcf21193a8b22a611f34db815fe.zip | |
[pam] fix bad commit
Diffstat (limited to 'remote/modules/pam')
| -rw-r--r-- | remote/modules/pam/pam.conf | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index 04b299ab..5f762481 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -1,43 +1,3 @@ -<<<<<<< HEAD -REQUIRED_INSTALLED_PACKAGES=" libpam-ldap - libnss-ldap - libpam-script - krb5-user - krb5-config - libpam-krb5 - libpam-mount" -REQUIRED_CONTENT_PACKAGES=" libpam0g - libpam-modules - libpam-ck-connector - libpam-cap - libpam-script - libldap-2.4-2 - libpam-ldap - libnss-ldap - krb5-user - krb5-config - libpam-krb5 - libpam-mount" -REQUIRED_BINARIES=" mount.crypt - umount.crypt - mount.crypt_LUKS - umount.crypt_LUKS - mount.crypto_LUKS - umount.crypto_LUKS - rpc.gssd - rpc.idmapd" -REQUIRED_SYSTEM_FILES=" /lib/security/pam_mount.so" -REQUIRED_DIRECTORIES=" /lib - /usr/lib - /etc/security" -REQUIRED_SYSTEM_FILES=" /sbin/mkhomedir_helper - /etc/pam.conf - /etc/login.defs - /etc/securetty - /etc/default/locale - /lib/security - /lib/${ARCH_TRIPLET}/security" -======= REQUIRED_INSTALLED_PACKAGES=" libpam-ldap libnss-ldap @@ -45,7 +5,6 @@ REQUIRED_INSTALLED_PACKAGES=" krb5-user krb5-config libpam-krb5 - libpam-mount libssl-dev " REQUIRED_CONTENT_PACKAGES=" @@ -63,6 +22,8 @@ REQUIRED_CONTENT_PACKAGES=" libpam-mount " REQUIRED_BINARIES=" + rpc.gssd + rpc.idmapd sslconnect mount.crypt umount.crypt @@ -85,5 +46,3 @@ REQUIRED_SYSTEM_FILES=" /lib/security /lib/${ARCH_TRIPLET}/security " - ->>>>>>> b7cbad98534b00134197f4ebbf4eed416de8a654 |