From 4e2e230b071e37342e15a3a52c9348f2a46b5e14 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 9 May 2009 17:03:49 +0000 Subject: [PATCH] * debian/rules, debian/passwd.newusers.pam, debian/passwd.chpasswd.pam: Install the newusers and chpasswd PAM service configuration files. newusers and chpasswd now use PAM to update the passwords. Closes: #525153 --- debian/changelog | 6 +++++- debian/passwd.chpasswd.pam | 5 +---- debian/passwd.newusers.pam | 6 +----- debian/rules | 4 +++- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02173383..f6eff012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,12 @@ shadow (1:4.1.3.1-1) UNRELEASED; urgency=low + debian/patches/429_login_FAILLOG_ENAB + debian/patches/463_login_delay_obeys_to_PAM * debian/securetty.linux: Added Freescale i.MX ports. Closes: #527095 + * debian/rules, debian/passwd.newusers.pam, debian/passwd.chpasswd.pam: + Install the newusers and chpasswd PAM service configuration files. + newusers and chpasswd now use PAM to update the passwords. + Closes: #525153 - -- Christian Perrier Sat, 09 May 2009 15:44:03 +0200 + -- Christian Perrier Sat, 09 May 2009 19:02:36 +0200 shadow (1:4.1.3.1-1) unstable; urgency=low diff --git a/debian/passwd.chpasswd.pam b/debian/passwd.chpasswd.pam index 2a852abe..da2adcc9 100644 --- a/debian/passwd.chpasswd.pam +++ b/debian/passwd.chpasswd.pam @@ -1,8 +1,5 @@ # The PAM configuration file for the Shadow 'chpasswd' service # -# This allows root to use chpasswd without being prompted for a password -auth sufficient pam_rootok.so +@include common-password -# checks for account validity -account required pam_permit.so diff --git a/debian/passwd.newusers.pam b/debian/passwd.newusers.pam index d719c657..552ca902 100644 --- a/debian/passwd.newusers.pam +++ b/debian/passwd.newusers.pam @@ -1,9 +1,5 @@ # The PAM configuration file for the Shadow 'newusers' service # -# This allows root to add users with a batch file without being -# prompted for a password -auth sufficient pam_rootok.so +@include common-password -# checks for account validity -account required pam_permit.so diff --git a/debian/rules b/debian/rules index 180ac0fd..3898e7e1 100755 --- a/debian/rules +++ b/debian/rules @@ -55,10 +55,12 @@ binary-install/passwd:: install -c -m 444 man/pl/shadowconfig.8 debian/passwd/usr/share/man/pl/man8 install -c -m 444 man/fr/shadowconfig.8 debian/passwd/usr/share/man/fr/man8 # Distribute the pam.d files; unless for the commands with disabled PAM - # support (see patch 404_undef_USE_PAM.dpatch) + # support dh_installpam -p passwd --name=passwd dh_installpam -p passwd --name=chfn dh_installpam -p passwd --name=chsh + dh_installpam -p passwd --name=chpasswd + dh_installpam -p passwd --name=newusers ifeq ($(DEB_HOST_ARCH_OS),hurd) # login is not built on The Hurd, but some utilities of passwd depends on # /etc/login.defs.