- updated old and added new pam configs

diff --git a/chage.pamd b/chage.pamd
index 2e1633abef55f20e20430bca96e636367312ae3f..cd2149e8c20d4d741aa1b393149728cad605638d 100644 (file)
--- a/chage.pamd
+++ b/chage.pamd
@@ -2,5 +2,4 @@
 auth           sufficient      pam_rootok.so
 auth           required        pam_deny.so
 account                required        pam_permit.so
-password       required        pam_exec.so failok seteuid /usr/bin/make -C /var/db
-# password     required        pam_exec.so failok seteuid /usr/bin/make -C /var/yp
+password       include         system-auth

diff --git a/chgpasswd.pamd b/chgpasswd.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/chgpasswd.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/chpasswd.pamd b/chpasswd.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/chpasswd.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/groupadd.pamd b/groupadd.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/groupadd.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/groupdel.pamd b/groupdel.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/groupdel.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/groupmems.pamd b/groupmems.pamd
new file mode 100644 (file)
index 0000000..0aa09c4
--- /dev/null
+++ b/groupmems.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_listfile.so item=user sense=allow file=/etc/security/chfn.allow onerr=fail
+auth           include         system-auth
+account                include         system-auth
+password       include         system-auth

diff --git a/groupmod.pamd b/groupmod.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/groupmod.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/newusers.pamd b/newusers.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/newusers.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/shadow.spec b/shadow.spec
index 3d50d141aaf6adea4e54d3f96a111570f8ebd6a8..d77a4f46364e1145dac870fafb0fde8ee10d4228 100644 (file)
--- a/shadow.spec
+++ b/shadow.spec
@@ -98,17 +98,24 @@ License:    BSD
 Group:         Applications/System
 Source0:       http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2
 # Source0-md5: a00449aa439c69287b6d472191dc2247
-Source10:      http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2.sig
-# Source10-md5:        f16f31f6f5a607b1ffb1aa1aac4c37f2
-Source1:       %{name}-login.defs
-Source2:       %{name}.useradd
-Source3:       chage.pamd
-Source4:       userdb.pamd
-Source5:       chsh.pamd
-Source6:       chfn.pamd
-Source7:       passwd.pamd
-Source8:       useradd.pamd
-#Source9:      chpasswd.pamd
+Source1:       http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2.sig
+# Source1-md5: f16f31f6f5a607b1ffb1aa1aac4c37f2
+Source2:       %{name}-login.defs
+Source3:       %{name}.useradd
+Source10:      chage.pamd
+Source11:      chfn.pamd
+Source12:      chgpasswd.pamd
+Source13:      chpasswd.pamd
+Source14:      chsh.pamd
+Source15:      groupadd.pamd
+Source16:      groupdel.pamd
+Source17:      groupmems.pamd
+Source18:      groupmod.pamd
+Source19:      newusers.pamd
+Source20:      passwd.pamd
+Source21:      useradd.pamd
+Source22:      userdel.pamd
+Source23:      usermod.pamd
 Patch0:                %{name}-pld.patch
 URL:           http://pkg-shadow.alioth.debian.org/
 BuildRequires: autoconf
@@ -235,20 +242,23 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir}/{default,pam.d,security,skel/tmp
 # move nologin "shell" where useradd specifies it
 %{__mv} $RPM_BUILD_ROOT%{_sbindir}/nologin $RPM_BUILD_ROOT/sbin
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/login.defs
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/useradd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/chage
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/shadow
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/chsh
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/chfn
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/passwd
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/useradd
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/chpasswd
-sed -e 's/usermod/userdel/' etc/pam.d/usermod > $RPM_BUILD_ROOT/etc/pam.d/userdel
-install etc/pam.d/usermod $RPM_BUILD_ROOT/etc/pam.d/usermod
-install etc/pam.d/groupadd $RPM_BUILD_ROOT/etc/pam.d/groupadd
-install etc/pam.d/groupmod $RPM_BUILD_ROOT/etc/pam.d/groupmod
-install etc/pam.d/groupdel $RPM_BUILD_ROOT/etc/pam.d/groupdel
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/login.defs
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/default/useradd
+
+install %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/chage
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/pam.d/chfn
+install %{SOURCE12} $RPM_BUILD_ROOT/etc/pam.d/chgpasswd
+install %{SOURCE13} $RPM_BUILD_ROOT/etc/pam.d/chpasswd
+install %{SOURCE14} $RPM_BUILD_ROOT/etc/pam.d/chsh
+install %{SOURCE15} $RPM_BUILD_ROOT/etc/pam.d/groupadd
+install %{SOURCE16} $RPM_BUILD_ROOT/etc/pam.d/groupdel
+install %{SOURCE17} $RPM_BUILD_ROOT/etc/pam.d/groupmems
+install %{SOURCE18} $RPM_BUILD_ROOT/etc/pam.d/groupmod
+install %{SOURCE19} $RPM_BUILD_ROOT/etc/pam.d/newusers
+install %{SOURCE20} $RPM_BUILD_ROOT/etc/pam.d/passwd
+install %{SOURCE21} $RPM_BUILD_ROOT/etc/pam.d/useradd
+install %{SOURCE22} $RPM_BUILD_ROOT/etc/pam.d/userdel
+install %{SOURCE23} $RPM_BUILD_ROOT/etc/pam.d/usermod
 
 > $RPM_BUILD_ROOT%{_sysconfdir}/shadow
 > $RPM_BUILD_ROOT/etc/security/chfn.allow
@@ -273,18 +283,17 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}/default
 %attr(640,root,root) %config %verify(not md5 mtime size) %{_sysconfdir}/default/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chage
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chpasswd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chgpasswd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chpasswd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupadd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupdel
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupmems
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupmod
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/newusers
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/passwd
-#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/shadow
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/useradd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/usermod
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/userdel
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupadd
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupdel
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/groupmod
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/login.defs
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/shadow

diff --git a/useradd.pamd b/useradd.pamd
index 6a97ba036e82c1ddaf87cdc6bd47d30c695c0969..cd2149e8c20d4d741aa1b393149728cad605638d 100644 (file)
--- a/useradd.pamd
+++ b/useradd.pamd
@@ -1,6 +1,5 @@
-#%PAM-1.0 
+#%PAM-1.0
 auth           sufficient      pam_rootok.so
 auth           required        pam_deny.so
 account                required        pam_permit.so
-password       required        pam_exec.so failok seteuid /usr/bin/make -C /var/db
-# password     required        pam_exec.so failok seteuid /usr/bin/make -C /var/yp
+password       include         system-auth

diff --git a/userdb.pamd b/userdb.pamd
deleted file mode 100644 (file)
index 2e1633a..0000000
--- a/userdb.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth           sufficient      pam_rootok.so
-auth           required        pam_deny.so
-account                required        pam_permit.so
-password       required        pam_exec.so failok seteuid /usr/bin/make -C /var/db
-# password     required        pam_exec.so failok seteuid /usr/bin/make -C /var/yp

diff --git a/userdel.pamd b/userdel.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/userdel.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth

diff --git a/usermod.pamd b/usermod.pamd
new file mode 100644 (file)
index 0000000..cd2149e
--- /dev/null
+++ b/usermod.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+auth           required        pam_deny.so
+account                required        pam_permit.so
+password       include         system-auth