diff options
| author |   Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-18 14:00:03 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-18 14:00:03 +0100 |
| commit | d2165ca8de9aeba863c98a8059e2b0f1e1f1c539 (patch) | |
| tree | 4fdb12014142bd32a6e7513002ad508153d35250 | |
| parent | Don't fall to pam_deny to avoid further modules to be executed. (diff) | |
| download | pambase-20080318.tar.gz pambase-20080318.tar.bz2 pambase-20080318.zip | |
Make sure gnome-keyring is always ran after system-auth has completed.pambase-20080318
| -rw-r--r-- | system-login.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/system-login.in b/system-login.in index c706065..d4089b3 100644 --- a/system-login.in +++ b/system-login.in @@ -1,6 +1,3 @@ -#if HAVE_GNOME_KEYRING -auth optional pam_gnome_keyring.so -#endif #if HAVE_TALLY auth required pam_tally.so file=/var/log/faillog onerr=succeed DEBUG #endif @@ -9,6 +6,9 @@ auth required pam_shells.so DEBUG #endif auth required pam_nologin.so DEBUG_NOLOGIN auth include system-auth +#if HAVE_GNOME_KEYRING +auth optional pam_gnome_keyring.so +#endif #if HAVE_ACCESS account required pam_access.so DEBUG @@ -24,22 +24,22 @@ account include system-auth account required pam_tally.so file=/var/log/faillog onerr=succeed DEBUG #endif +password include system-auth #if HAVE_GNOME_KEYRING password optional pam_gnome_keyring.so #endif -password include system-auth #if HAVE_SELINUX session required pam_selinux.so close #endif -#if HAVE_GNOME_KEYRING -session optional pam_gnome_keyring.so auto_start -#endif #if HAVE_ENV session required pam_env.so DEBUG #endif session optional pam_lastlog.so DEBUG session include system-auth +#if HAVE_GNOME_KEYRING +session optional pam_gnome_keyring.so auto_start +#endif #if HAVE_SELINUX session required pam_selinux.so multiple open #endif |