Relevant BUGIDs: 227565

Purpose of commit: cleanup

Commit summary:
---------------
I've removed pam_pwdb from the suggested pam.conf template.

diff --git a/CHANGELOG b/CHANGELOG
index 3bf585f2734aaa3b8050e05ad3f00a6a1b7dc860..fdc565c6c9446b31a6904b61c4c6afb469f9476f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,8 @@ libpam. Prior versions were buggy - see bugfix for Bug 129775.
 
                           ** WARNING **
 
+* pam_pwdb has been removed from the suggested pam.conf template. I've
+  replaced it with pam_unix. (Bug 227565 - agmorgan)
 * pam_limits - Richard M. Yumul reported that "<domain> -" didn't
   work, first fix suggested by Werner Puschitz (Bug 404953 - agmorgan)
 * Nicolay Pelov suggested a simple fix for freebsd support (Bug 407282

diff --git a/conf/pam.conf b/conf/pam.conf
index 3f10b106113aabc756f38cfd65a743b4340913dd..aa0e413012aa08a7238f49759c242dd5b3812ca4 100644 (file)
--- a/conf/pam.conf
+++ b/conf/pam.conf
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------------#
 # /etc/pam.conf                                                                     #
 #                                                                           #
-# Last modified by Andrew G. Morgan <morgan@parc.power.net>                 #
+# Last modified by Andrew G. Morgan <morgan@kernel.org>                             #
 # ---------------------------------------------------------------------------#
 # $Id$
 # ---------------------------------------------------------------------------#
@@ -11,46 +11,46 @@
 #
 # The PAM configuration file for the `chfn' service
 #
-chfn   auth       required   pam_pwdb.so
-chfn   account    required   pam_pwdb.so
+chfn   auth       required   pam_unix.so
+chfn   account    required   pam_unix.so
 chfn   password   required   pam_cracklib.so retry=3
-chfn   password   required   pam_pwdb.so shadow md5 use_authtok
+chfn   password   required   pam_unix.so shadow md5 use_authtok
 #
 # The PAM configuration file for the `chsh' service
 #
-chsh   auth       required   pam_pwdb.so
-chsh   account    required   pam_pwdb.so
+chsh   auth       required   pam_unix.so
+chsh   account    required   pam_unix.so
 chsh   password   required   pam_cracklib.so retry=3
-chsh   password   required   pam_pwdb.so shadow md5 use_authtok
+chsh   password   required   pam_unix.so shadow md5 use_authtok
 #
 # The PAM configuration file for the `ftp' service
 #
 ftp    auth       requisite  pam_listfile.so \
                item=user sense=deny file=/etc/ftpusers onerr=succeed
 ftp    auth       requisite  pam_shells.so
-ftp    auth       required   pam_pwdb.so
-ftp    account    required   pam_pwdb.so
+ftp    auth       required   pam_unix.so
+ftp    account    required   pam_unix.so
 #
 # The PAM configuration file for the `imap' service
 #
-imap   auth       required   pam_pwdb.so
-imap   account    required   pam_pwdb.so
+imap   auth       required   pam_unix.so
+imap   account    required   pam_unix.so
 #
 # The PAM configuration file for the `login' service
 #
 login  auth       requisite  pam_securetty.so
-login  auth       required   pam_pwdb.so
+login  auth       required   pam_unix.so
 login  auth       optional   pam_group.so
 login  account    requisite  pam_time.so
-login  account    required   pam_pwdb.so
+login  account    required   pam_unix.so
 login  password   required   pam_cracklib.so retry=3
-login  password   required   pam_pwdb.so shadow md5 use_authtok
-login  session    required   pam_pwdb.so
+login  password   required   pam_unix.so shadow md5 use_authtok
+login  session    required   pam_unix.so
 #
 # The PAM configuration file for the `netatalk' service
 #
-netatalk       auth       required   pam_pwdb.so
-netatalk       account    required   pam_pwdb.so
+netatalk       auth       required   pam_unix.so
+netatalk       account    required   pam_unix.so
 #
 # The PAM configuration file for the `other' service
 #
@@ -64,16 +64,16 @@ other       session    required   pam_deny.so
 # The PAM configuration file for the `passwd' service
 #
 passwd password   requisite  pam_cracklib.so retry=3
-passwd password   required   pam_pwdb.so shadow md5 use_authtok
+passwd password   required   pam_unix.so shadow md5 use_authtok
 #
 # The PAM configuration file for the `rexec' service
 #
 rexec  auth       requisite  pam_securetty.so
 rexec  auth       requisite  pam_nologin.so
 rexec  auth       sufficient pam_rhosts_auth.so
-rexec  auth       required   pam_pwdb.so
-rexec  account    required   pam_pwdb.so
-rexec  session    required   pam_pwdb.so
+rexec  auth       required   pam_unix.so
+rexec  account    required   pam_unix.so
+rexec  session    required   pam_unix.so
 rexec  session    required   pam_limits.so
 #
 # The PAM configuration file for the `rlogin' service
@@ -82,10 +82,10 @@ rexec       session    required   pam_limits.so
 rlogin auth       requisite  pam_securetty.so
 rlogin auth       requisite  pam_nologin.so
 rlogin auth       required   pam_rhosts_auth.so
-rlogin account    required   pam_pwdb.so
+rlogin account    required   pam_unix.so
 rlogin password   required   pam_cracklib.so retry=3
-rlogin password   required   pam_pwdb.so shadow md5 use_authtok
-rlogin session    required   pam_pwdb.so
+rlogin password   required   pam_unix.so shadow md5 use_authtok
+rlogin session    required   pam_unix.so
 rlogin session    required   pam_limits.so
 #
 # The PAM configuration file for the `rsh' service
@@ -93,34 +93,34 @@ rlogin      session    required   pam_limits.so
 rsh    auth       requisite  pam_securetty.so
 rsh    auth       requisite  pam_nologin.so
 rsh    auth       sufficient pam_rhosts_auth.so
-rsh    auth       required   pam_pwdb.so
-rsh    account    required   pam_pwdb.so
-rsh    session    required   pam_pwdb.so
+rsh    auth       required   pam_unix.so
+rsh    account    required   pam_unix.so
+rsh    session    required   pam_unix.so
 rsh    session    required   pam_limits.so
 #
 # The PAM configuration file for the `samba' service
 #
-samba  auth       required   pam_pwdb.so
-samba  account    required   pam_pwdb.so
+samba  auth       required   pam_unix.so
+samba  account    required   pam_unix.so
 #
 # The PAM configuration file for the `su' service
 #
 su     auth       required   pam_wheel.so
 su     auth       sufficient pam_rootok.so
-su     auth       required   pam_pwdb.so
-su     account    required   pam_pwdb.so
-su     session    required   pam_pwdb.so
+su     auth       required   pam_unix.so
+su     account    required   pam_unix.so
+su     session    required   pam_unix.so
 #
 # The PAM configuration file for the `vlock' service
 #
-vlock  auth       required   pam_pwdb.so
+vlock  auth       required   pam_unix.so
 #
 # The PAM configuration file for the `xdm' service
 #
-xdm    auth       required   pam_pwdb.so
-xdm    account    required   pam_pwdb.so
+xdm    auth       required   pam_unix.so
+xdm    account    required   pam_unix.so
 #
 # The PAM configuration file for the `xlock' service
 #
-xlock  auth       required   pam_pwdb.so
+xlock  auth       required   pam_unix.so