[pam] update configs

3 files changed, 52 insertions, 58 deletions

diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf
index 4ec4da3f..4e2e01a1 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/pam.conf
@@ -1,42 +1,8 @@
-REQUIRED_INSTALLED_PACKAGES="
-	libpam-ldap
-	libnss-ldap
-	krb5-user
-	krb5-config
-	libpam-krb5
-	libssl-dev
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	libpam0g-dev
-	ncpfs
-"
-REQUIRED_CONTENT_PACKAGES="
-	libpam0g
-	libpam-modules
-	libpam-ck-connector
-	libpam-cap
-	libldap-2.4-2
-	libpam-ldap
-	libnss-ldap
-	krb5-user
-	krb5-config
-	libpam-krb5
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	ncpfs
-"
 REQUIRED_BINARIES="
+	ldapsearch
 	rpc.gssd
 	rpc.idmapd
 	sslconnect
-	ldapsearch
-	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
 "
 REQUIRED_LIBRARIES="
 	nsswitch
@@ -46,18 +12,11 @@ REQUIRED_LIBRARIES="
 	pam_script
 "
 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_PAM_SCRIPT_VERSION="1.1.6"
 REQUIRED_PAM_SCRIPT_URL="http://downloads.sourceforge.net/project/pam-script/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}.tar.gz"
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.opensuse
index 9319e78c..9b3d3247 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.opensuse
@@ -25,33 +25,21 @@ REQUIRED_CONTENT_PACKAGES="
 	nfs-client
 	glibc
 "
-REQUIRED_BINARIES="
-	sslconnect
-	ldapsearch
+REQUIRED_BINARIES+="
 	mkhomedir_helper
-	rpc.gssd
-	rpc.idmapd
 "
-REQUIRED_LIBRARIES="
-        nsswitch
-        static
-        umich_ldap
-        libnfsidmap
+REQUIRED_LIBRARIES+="
 	libnss_compat
 	libnss_db
 	libnss_dns
 	libnss_files
 	libnss_nis
 "
-
-REQUIRED_DIRECTORIES="
+REQUIRED_DIRECTORIES+="
 	/$LIB64
 	/usr/$LIB64
-	/etc/security
 "
-REQUIRED_SYSTEM_FILES="
-	/etc/login.defs
-	/etc/securetty
+REQUIRED_SYSTEM_FILES+="
 	/$LIB64/security
 "
 
diff --git a/remote/modules/pam/pam.conf.ubuntu b/remote/modules/pam/pam.conf.ubuntu
new file mode 100644
index 00000000..c1516e13
--- /dev/null
+++ b/remote/modules/pam/pam.conf.ubuntu
@@ -0,0 +1,47 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libpam-ldap
+	libnss-ldap
+	krb5-user
+	krb5-config
+	libpam-krb5
+	libssl-dev
+	ldap-utils
+	libnfsidmap2
+	nfs-common
+	libpam0g-dev
+	ncpfs
+"
+REQUIRED_CONTENT_PACKAGES="
+	libpam0g
+	libpam-modules
+	libpam-ck-connector
+	libpam-cap
+	libldap-2.4-2
+	libpam-ldap
+	libnss-ldap
+	krb5-user
+	krb5-config
+	libpam-krb5
+	ldap-utils
+	libnfsidmap2
+	nfs-common
+	ncpfs
+"
+REQUIRED_BINARIES+="
+	nwmsg
+	ncpmount
+	ncpumount
+	mount.ncp
+	mount.ncpfs
+"
+REQUIRED_DIRECTORIES+="
+	/lib
+	/usr/lib
+"
+REQUIRED_SYSTEM_FILES+="
+	/etc/pam.conf
+	/etc/default/locale
+	/lib/security
+	/lib/${ARCH_TRIPLET}/security
+	/sbin/mkhomedir_helper
+"