summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-10-30 16:22:40 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-10-30 16:22:40 -0700
commitf0899e792860b7bb7ee447b0c71c7c57555cd664 (patch)
treeef58d56057667b904b6c5bb1a2fca6b2fd50e85f
parentd0af9714b9ac3b6859124d5d47c325e938bd2f61 (diff)
downloadxfce4-session-f0899e792860b7bb7ee447b0c71c7c57555cd664.tar.gz
Start gnome-keyring-daemon with --components=pkcs11,secrets
-rw-r--r--debian/changelog7
-rw-r--r--xfce4-session/xfsm-compat-gnome.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8eb241a..dbae65d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfce4-session (4.12.1-6+athena1) buster; urgency=medium
+
+ * Start gnome-keyring-daemon with --components=pkcs11,secrets so that
+ SSH_AUTH_SOCK set by /etc/X11/Xsession.d/90gpg-agent is not clobbered.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Fri, 30 Oct 2020 16:22:28 -0700
+
xfce4-session (4.12.1-6) unstable; urgency=medium
* debian/control:
diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
index 35e9617..b54a333 100644
--- a/xfce4-session/xfsm-compat-gnome.c
+++ b/xfce4-session/xfsm-compat-gnome.c
@@ -107,7 +107,7 @@ gnome_keyring_daemon_startup (void)
gint status;
glong pid;
gchar *end;
- gchar *argv[3];
+ gchar *argv[4];
gchar *p;
gchar *name;
const gchar *value;
@@ -122,7 +122,8 @@ gnome_keyring_daemon_startup (void)
error = NULL;
argv[0] = GNOME_KEYRING_DAEMON;
argv[1] = "--start";
- argv[2] = NULL;
+ argv[2] = "--components=pkcs11,secrets";
+ argv[3] = NULL;
g_spawn_sync (NULL, argv, NULL,
G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
child_setup, NULL,