diff options
| author | piernov <piernov@piernov.org> | 2011-09-26 20:51:10 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2011-09-26 20:51:10 +0200 |
| commit | aa4b6239355bcd7e0f1de40704dc40e2601ce17c (patch) | |
| tree | 0d7547b77999d4b96e93f91295fac43fc7d61f3f /gnome-keyring/nopass.patch | |
| parent | 82de9698b3fd7ffd933ac16081e401cc14c261e1 (diff) | |
| parent | 0bf08bf92789de3d565a91d411b1b1c330ba765a (diff) | |
| download | gnome3-aa4b6239355bcd7e0f1de40704dc40e2601ce17c.tar.gz gnome3-aa4b6239355bcd7e0f1de40704dc40e2601ce17c.tar.bz2 gnome3-aa4b6239355bcd7e0f1de40704dc40e2601ce17c.tar.xz gnome3-aa4b6239355bcd7e0f1de40704dc40e2601ce17c.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/gnome3
Diffstat (limited to 'gnome-keyring/nopass.patch')
| -rw-r--r-- | gnome-keyring/nopass.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnome-keyring/nopass.patch b/gnome-keyring/nopass.patch new file mode 100644 index 0000000..1e42a0b --- /dev/null +++ b/gnome-keyring/nopass.patch @@ -0,0 +1,22 @@ +diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c +--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass 2009-09-25 21:55:50.000000000 -0400 ++++ gnome-keyring-2.28.1/pam/gkr-pam-module.c 2009-10-19 11:27:34.000000000 -0400 +@@ -866,6 +866,7 @@ pam_sm_authenticate (pam_handle_t *ph, i + + started_daemon = 0; + ++ + /* Should we start the daemon? */ + if (args & ARG_AUTO_START) { + ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); +@@ -932,8 +933,9 @@ pam_sm_open_session (pam_handle_t *ph, i + * different PAM callbacks from different processes. + * + * No use complaining ++ * Do not start gnome-keyring, dbus will start it on login. + */ +- password = NULL; ++ return PAM_SUCCESS; + } + + started_daemon = 0; |