--- etc.pam.conf.orig	2005-12-20 17:13:26.205771586 -0500
+++ etc.pam.conf.kde	2005-12-13 23:39:53.709969000 -0500
@@ -106,4 +106,360 @@
 xscreensaver	auth required		pam_unix_cred.so.1
 xscreensaver	auth required		pam_unix_auth.so.1
 xscreensaver	auth required		pam_dial_auth.so.1
-
+#
+# KDE
+#
+kde     auth requisite          pam_authtok_get.so.1
+kde     auth required           pam_dhkeys.so.1
+kde     auth required           pam_unix_auth.so.1
+kde     auth requisite          pam_authtok_get.so.1
+kde     auth requisite          pam_dhkeys.so.1
+kde     auth requisite          pam_unix_auth.so.1
+kde     auth requisite          pam_authtok_get.so.1
+kde     auth sufficient         pam_dhkeys.so.1
+kde     auth sufficient         pam_unix_auth.so.1
+kde     auth requisite          pam_authtok_get.so.1
+kde     auth optional           pam_dhkeys.so.1
+kde     auth optional           pam_unix_auth.so.1
+kde     account requisite               pam_roles.so.1
+kde     account optional                pam_roles.so.1
+kde     account sufficient              pam_roles.so.1
+kde     account required                pam_unix_account.so.1
+kde     account requisite               pam_unix_account.so.1
+kde     account sufficient              pam_unix_account.so.1
+kde     account optional                pam_unix_account.so.1
+kde     session optional                pam_unix_session.so.1
+#
+kio_uiserver    auth    requisite       pam_authtok_get.so.1
+kio_uiserver    auth    sufficient      pam_dhkeys.so.1
+kio_uiserver    auth    sufficient      pam_unix_auth.so.1
+kio_uiserver    auth    requisite       pam_authtok_get.so.1
+kio_uiserver    auth    optional        pam_dhkeys.so.1
+kio_uiserver    auth    optional        pam_unix_auth.so.1
+#
+kio_uiserver    account sufficient      pam_unix_account.so.1
+kio_uiserver    account optional        pam_unix_account.so.1
+#
+kcminit         auth    requisite       pam_authtok_get.so.1
+kcminit         auth    sufficient      pam_dhkeys.so.1
+kcminit         auth    sufficient      pam_unix_auth.so.1
+kcminit         auth    requisite       pam_authtok_get.so.1
+kcminit         auth    optional        pam_dhkeys.so.1
+kcminit         auth    optional        pam_unix_auth.so.1
+#
+kcminit         account sufficient      pam_unix_account.so.1
+kcminit         account optional        pam_unix_account.so.1
+#
+kdeinit         auth    requisite       pam_authtok_get.so.1
+kdeinit         auth    sufficient      pam_dhkeys.so.1
+kdeinit         auth    sufficient      pam_unix_auth.so.1
+kdeinit         auth    requisite       pam_authtok_get.so.1
+kdeinit         auth    optional        pam_dhkeys.so.1
+kdeinit         auth    optional        pam_unix_auth.so.1
+#
+kdeinit         account sufficient      pam_unix_account.so.1
+kdeinit         account optional        pam_unix_account.so.1
+#
+ksmserver               auth    requisite       pam_authtok_get.so.1
+ksmserver               auth    sufficient      pam_dhkeys.so.1
+ksmserver               auth    sufficient      pam_unix_auth.so.1
+ksmserver               auth    requisite       pam_authtok_get.so.1
+ksmserver               auth    optional        pam_dhkeys.so.1
+ksmserver               auth    optional        pam_unix_auth.so.1
+#
+ksmserver               account sufficient      pam_unix_account.so.1
+ksmserver               account optional        pam_unix_account.so.1
+#
+knotify auth requisite          pam_authtok_get.so.1
+knotify auth sufficient         pam_dhkeys.so.1
+knotify auth sufficient         pam_unix_auth.so.1
+knotify auth requisite          pam_authtok_get.so.1
+knotify auth optional           pam_dhkeys.so.1
+knotify auth optional           pam_unix_auth.so.1
+#
+knotify auth requisite          pam_authtok_get.so.1
+knotify auth sufficient         pam_dhkeys.so.1
+knotify auth sufficient         pam_unix_auth.so.1
+knotify auth requisite          pam_authtok_get.so.1
+knotify auth optional           pam_dhkeys.so.1
+knotify auth optional           pam_unix_auth.so.1
+#
+knotify account sufficient              pam_unix_account.so.1
+knotify account optional                pam_unix_account.so.1
+#
+dcopserver      auth requisite          pam_authtok_get.so.1
+dcopserver      auth sufficient         pam_dhkeys.so.1
+dcopserver      auth sufficient         pam_unix_auth.so.1
+dcopserver      auth requisite          pam_authtok_get.so.1
+dcopserver      auth optional           pam_dhkeys.so.1
+dcopserver      auth optional           pam_unix_auth.so.1
+#
+dcopserver      account sufficient              pam_unix_account.so.1
+dcopserver      account optional                pam_unix_account.so.1
+#
+kwin    auth requisite          pam_authtok_get.so.1
+kwin    auth sufficient         pam_dhkeys.so.1
+kwin    auth sufficient         pam_unix_auth.so.1
+kwin    auth requisite          pam_authtok_get.so.1
+kwin    auth optional           pam_dhkeys.so.1
+kwin    auth optional           pam_unix_auth.so.1
+#
+kwin    account sufficient              pam_unix_account.so.1
+kwin    account optional                pam_unix_account.so.1
+#
+kwin4   auth requisite          pam_authtok_get.so.1
+kwin4   auth sufficient         pam_dhkeys.so.1
+kwin4   auth sufficient         pam_unix_auth.so.1
+kwin4   auth requisite          pam_authtok_get.so.1
+kwin4   auth optional           pam_dhkeys.so.1
+kwin4   auth optional           pam_unix_auth.so.1
+#
+kwin4   account sufficient              pam_unix_account.so.1
+kwin4   account optional                pam_unix_account.so.1
+#
+kinetd  auth requisite          pam_authtok_get.so.1
+kinetd  auth sufficient         pam_dhkeys.so.1
+kinetd  auth sufficient         pam_unix_auth.so.1
+kinetd  auth requisite          pam_authtok_get.so.1
+kinetd  auth optional           pam_dhkeys.so.1
+kinetd  auth optional           pam_unix_auth.so.1
+#
+kinetd  account sufficient              pam_unix_account.so.1
+kinetd  account optional                pam_unix_account.so.1
+#
+konqueror       auth requisite          pam_authtok_get.so.1
+konqueror       auth sufficient         pam_dhkeys.so.1
+konqueror       auth sufficient         pam_unix_auth.so.1
+konqueror       auth requisite          pam_authtok_get.so.1
+konqueror       auth optional           pam_dhkeys.so.1
+konqueror       auth optional           pam_unix_auth.so.1
+#
+konqueror       account sufficient              pam_unix_account.so.1
+konqueror       account optional                pam_unix_account.so.1
+#
+kioslave        auth requisite          pam_authtok_get.so.1
+kioslave        auth sufficient         pam_dhkeys.so.1
+kioslave        auth sufficient         pam_unix_auth.so.1
+kioslave        auth requisite          pam_authtok_get.so.1
+kioslave        auth optional           pam_dhkeys.so.1
+kioslave        auth optional           pam_unix_auth.so.1
+#
+kioslave        account sufficient              pam_unix_account.so.1
+kioslave        account optional                pam_unix_account.so.1
+#
+kdesktop        auth requisite          pam_authtok_get.so.1
+kdesktop        auth sufficient         pam_dhkeys.so.1
+kdesktop        auth sufficient         pam_unix_auth.so.1
+kdesktop        auth requisite          pam_authtok_get.so.1
+kdesktop        auth optional           pam_dhkeys.so.1
+kdesktop        auth optional           pam_unix_auth.so.1
+#
+kdesktop        account sufficient              pam_unix_account.so.1
+kdesktop        account optional                pam_unix_account.so.1
+#
+ksmserver       auth requisite          pam_authtok_get.so.1
+ksmserver       auth sufficient         pam_dhkeys.so.1
+ksmserver       auth sufficient         pam_unix_auth.so.1
+ksmserver       auth requisite          pam_authtok_get.so.1
+ksmserver       auth optional           pam_dhkeys.so.1
+ksmserver       auth optional           pam_unix_auth.so.1
+#
+ksmserver       account sufficient              pam_unix_account.so.1
+ksmserver       account optional                pam_unix_account.so.1
+#
+kwrited   auth requisite          pam_authtok_get.so.1
+kwrited   auth sufficient         pam_dhkeys.so.1
+kwrited   auth sufficient         pam_unix_auth.so.1
+kwrited   auth requisite          pam_authtok_get.so.1
+kwrited   auth optional           pam_dhkeys.so.1
+kwrited   auth optional           pam_unix_auth.so.1
+#
+kwrited   account sufficient              pam_unix_account.so.1
+kwrited   account optional                pam_unix_account.so.1
+#
+kmail   auth requisite          pam_authtok_get.so.1
+kmail   auth sufficient         pam_dhkeys.so.1
+kmail   auth sufficient         pam_unix_auth.so.1
+kmail   auth requisite          pam_authtok_get.so.1
+kmail   auth optional           pam_dhkeys.so.1
+kmail   auth optional           pam_unix_auth.so.1
+#
+kmail   account sufficient              pam_unix_account.so.1
+kmail   account optional                pam_unix_account.so.1
+#
+kioslave        auth requisite          pam_authtok_get.so.1
+kioslave        auth sufficient         pam_dhkeys.so.1
+kioslave        auth sufficient         pam_unix_auth.so.1
+kioslave        auth requisite          pam_authtok_get.so.1
+kioslave        auth optional           pam_dhkeys.so.1
+kioslave        auth optional           pam_unix_auth.so.1
+#
+kioslave        account sufficient              pam_unix_account.so.1
+kioslave        account optional                pam_unix_account.so.1
+#
+kfmclient       auth requisite          pam_authtok_get.so.1
+kfmclient       auth sufficient         pam_dhkeys.so.1
+kfmclient       auth sufficient         pam_unix_auth.so.1
+kfmclient       auth requisite          pam_authtok_get.so.1
+kfmclient       auth optional           pam_dhkeys.so.1
+kfmclient       auth optional           pam_unix_auth.so.1
+#
+kfmclient       account sufficient              pam_unix_account.so.1
+kfmclient       account optional                pam_unix_account.so.1
+#
+utempter       auth requisite          pam_authtok_get.so.1
+utempter       auth sufficient         pam_dhkeys.so.1
+utempter       auth sufficient         pam_unix_auth.so.1
+utempter       auth requisite          pam_authtok_get.so.1
+utempter       auth optional           pam_dhkeys.so.1
+utempter       auth optional           pam_unix_auth.so.1
+#
+utempter       account sufficient              pam_unix_account.so.1
+utempter       account optional                pam_unix_account.so.1
+#
+kssld   auth requisite          pam_authtok_get.so.1
+kssld   auth sufficient         pam_dhkeys.so.1
+kssld   auth sufficient         pam_unix_auth.so.1
+kssld   auth requisite          pam_authtok_get.so.1
+kssld   auth optional           pam_dhkeys.so.1
+kssld   auth optional           pam_unix_auth.so.1
+#
+kssld   account sufficient              pam_unix_account.so.1
+kssld   account optional                pam_unix_account.so.1
+#
+kdesu   auth requisite          pam_authtok_get.so.1
+kdesu   auth sufficient         pam_dhkeys.so.1
+kdesu   auth sufficient         pam_unix_auth.so.1
+kdesu   auth requisite          pam_authtok_get.so.1
+kdesu   auth optional           pam_dhkeys.so.1
+kdesu   auth optional           pam_unix_auth.so.1
+#
+kdesu   account sufficient              pam_unix_account.so.1
+kdesu   account optional                pam_unix_account.so.1
+#
+kio_file        auth requisite          pam_authtok_get.so.1
+kio_file        auth sufficient         pam_dhkeys.so.1
+kio_file        auth sufficient         pam_unix_auth.so.1
+kio_file        auth requisite          pam_authtok_get.so.1
+kio_file        auth optional           pam_dhkeys.so.1
+kio_file        auth optional           pam_unix_auth.so.1
+#
+kio_file        account sufficient              pam_unix_account.so.1
+kio_file        account optional                pam_unix_account.so.1
+#
+kio_http        auth requisite          pam_authtok_get.so.1
+kio_http        auth sufficient         pam_dhkeys.so.1
+kio_http        auth sufficient         pam_unix_auth.so.1
+kio_http        auth requisite          pam_authtok_get.so.1
+kio_http        auth optional           pam_dhkeys.so.1
+kio_http        auth optional           pam_unix_auth.so.1
+#
+kio_http        account sufficient              pam_unix_account.so.1
+kio_http        account optional                pam_unix_account.so.1
+#
+kio_help        auth requisite          pam_authtok_get.so.1
+kio_help        auth sufficient         pam_dhkeys.so.1
+kio_help        auth sufficient         pam_unix_auth.so.1
+kio_help        auth requisite          pam_authtok_get.so.1
+kio_help        auth optional           pam_dhkeys.so.1
+kio_help        auth optional           pam_unix_auth.so.1
+#
+kio_help        account sufficient              pam_unix_account.so.1
+kio_help        account optional                pam_unix_account.so.1
+#
+kio     auth requisite          pam_authtok_get.so.1
+kio     auth sufficient         pam_dhkeys.so.1
+kio     auth sufficient         pam_unix_auth.so.1
+kio     auth requisite          pam_authtok_get.so.1
+kio     auth optional           pam_dhkeys.so.1
+kio     auth optional           pam_unix_auth.so.1
+#
+kio     account sufficient              pam_unix_account.so.1
+kio     account optional                pam_unix_account.so.1
+#
+kscreensaver    auth    requisite       pam_authtok_get.so.1
+kscreensaver    auth    sufficient      pam_dhkeys.so.1
+kscreensaver    auth    sufficient      pam_unix_auth.so.1
+kscreensaver    auth    requisite       pam_authtok_get.so.1
+kscreensaver    auth    optional        pam_dhkeys.so.1
+kscreensaver    auth    optional        pam_unix_auth.so.1
+#
+kscreensaver    account sufficient      pam_unix_account.so.1
+kscreensaver    account optional        pam_unix_account.so.1
+#
+cvsservice      auth    requisite       pam_authtok_get.so.1
+cvsservice      auth    sufficient      pam_dhkeys.so.1
+cvsservice      auth    sufficient      pam_unix_auth.so.1
+cvsservice      auth    requisite       pam_authtok_get.so.1
+cvsservice      auth    optional        pam_dhkeys.so.1
+cvsservice      auth    optional        pam_unix_auth.so.1
+#
+cvsservice      account sufficient      pam_unix_account.so.1
+cvsservice      account optional        pam_unix_account.so.1
+#
+xscreensaver    auth requisite          pam_authtok_get.so.1
+xscreensaver    auth sufficient         pam_dhkeys.so.1
+xscreensaver    auth sufficient         pam_unix_auth.so.1
+xscreensaver    auth requisite          pam_authtok_get.so.1
+xscreensaver    auth optional           pam_dhkeys.so.1
+xscreensaver    auth optional           pam_unix_auth.so.1
+#
+xscreensaver    account sufficient              pam_unix_account.so.1
+xscreensaver    account optional                pam_unix_account.so.1
+#
+session auth    sufficient              pam_pwdb.so
+session auth    optional                pam_pwdb.so
+#
+session account sufficient              pam_pwdb.so
+session account optional                pam_pwdb.so
+#
+fam     auth    requisite       pam_authtok_get.so.1
+fam     auth    sufficient      pam_dhkeys.so.1
+fam     auth    sufficient      pam_unix_auth.so.1
+fam     auth    requisite       pam_authtok_get.so.1
+fam     auth    optional        pam_dhkeys.so.1
+fam     auth    optional        pam_unix_auth.so.1
+#
+fam     account sufficient      pam_unix_account.so.1
+fam     account optional        pam_unix_account.so.1
+#
+nasd    auth    requisite       pam_authtok_get.so.1
+nasd    auth    sufficient      pam_dhkeys.so.1
+nasd    auth    sufficient      pam_unix_auth.so.1
+nasd    auth    requisite       pam_authtok_get.so.1
+nasd    auth    optional        pam_dhkeys.so.1
+nasd    auth    optional        pam_unix_auth.so.1
+#
+nasd    account sufficient      pam_unix_account.so.1
+nasd    account optional        pam_unix_account.so.1
+#
+krfb    auth    requisite       pam_authtok_get.so.1
+krfb    auth    sufficient      pam_dhkeys.so.1
+krfb    auth    sufficient      pam_unix_auth.so.1
+krfb    auth    requisite       pam_authtok_get.so.1
+krfb    auth    optional        pam_dhkeys.so.1
+krfb    auth    optional        pam_unix_auth.so.1
+#
+krfb    account sufficient      pam_unix_account.so.1
+krfb    account optional        pam_unix_account.so.1
+#
+silc    auth    requisite       pam_authtok_get.so.1
+silc    auth    sufficient      pam_dhkeys.so.1
+silc    auth    sufficient      pam_unix_auth.so.1
+silc    auth    requisite       pam_authtok_get.so.1
+silc    auth    optional        pam_dhkeys.so.1
+silc    auth    optional        pam_unix_auth.so.1
+#
+silc    account sufficient      pam_unix_account.so.1
+silc    account optional        pam_unix_account.so.1
+#
+Xvnc    auth    requisite       pam_authtok_get.so.1
+Xvnc    auth    sufficient      pam_dhkeys.so.1
+Xvnc    auth    sufficient      pam_unix_auth.so.1
+Xvnc    auth    requisite       pam_authtok_get.so.1
+Xvnc    auth    optional        pam_dhkeys.so.1
+Xvnc    auth    optional        pam_unix_auth.so.1
+#
+Xvnc    account sufficient      pam_unix_account.so.1
+Xvnc    account optional        pam_unix_account.so.1
+#
