summaryrefslogtreecommitdiffstats
path: root/gnome-keyring/nopass.patch
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-09-26 16:54:35 +0200
committerpiernov <piernov@piernov.org>2011-09-26 16:54:35 +0200
commitf74173e86ff65eea1dee01a71598c9772f5d3b78 (patch)
tree11906f0bac7e9e069f441387ade1a8d1331ff609 /gnome-keyring/nopass.patch
parent0eab34e5bbe681e59b9c569cd31a63b65f2558e8 (diff)
downloadgnome3-f74173e86ff65eea1dee01a71598c9772f5d3b78.tar.gz
gnome3-f74173e86ff65eea1dee01a71598c9772f5d3b78.tar.bz2
gnome3-f74173e86ff65eea1dee01a71598c9772f5d3b78.tar.xz
gnome3-f74173e86ff65eea1dee01a71598c9772f5d3b78.zip
gnome-keyring 3.2.0-1 màj port
Diffstat (limited to 'gnome-keyring/nopass.patch')
-rw-r--r--gnome-keyring/nopass.patch22
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;