|
1
|
|
-Author: Jindrich Makovicka <makovick@gmail.com>
|
|
2
|
|
-Description: GNOME_KEYRING_LIFETIME_FD was removed from gnome-keyring in 2009. Use new control protocol for daemon. (LP: #1846987)
|
|
3
|
|
-
|
|
4
|
|
-diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
|
|
5
|
|
-index 5e9cf02..b43f1ad 100644
|
|
6
|
|
---- a/mate-session/msm-gnome.c
|
|
7
|
|
-+++ b/mate-session/msm-gnome.c
|
|
8
|
|
-@@ -48,119 +48,46 @@
|
|
9
|
|
-
|
|
10
|
|
-
|
|
11
|
|
- static gboolean gnome_compat_started = FALSE;
|
|
12
|
|
--static int keyring_lifetime_pipe[2];
|
|
13
|
|
--static pid_t gnome_keyring_daemon_pid = 0;
|
|
14
|
|
- static Window gnome_smproxy_window = None;
|
|
15
|
|
-
|
|
16
|
|
- static void
|
|
17
|
|
--child_setup (gpointer user_data)
|
|
18
|
|
-+gnome_keyring_daemon_finished (GPid pid,
|
|
19
|
|
-+ gint status,
|
|
20
|
|
-+ gpointer user_data)
|
|
21
|
|
- {
|
|
22
|
|
-- gint open_max;
|
|
23
|
|
-- gint fd;
|
|
24
|
|
-- char *fd_str;
|
|
25
|
|
--
|
|
26
|
|
-- open_max = sysconf (_SC_OPEN_MAX);
|
|
27
|
|
-- for (fd = 3; fd < open_max; fd++)
|
|
28
|
|
-+ if (WEXITSTATUS (status) != 0)
|
|
29
|
|
- {
|
|
30
|
|
-- if (fd != keyring_lifetime_pipe[0])
|
|
31
|
|
-- fcntl (fd, F_SETFD, FD_CLOEXEC);
|
|
32
|
|
-+ /* daemon failed for some reason */
|
|
33
|
|
-+ g_printerr ("gnome-keyring-daemon failed to start correctly, "
|
|
34
|
|
-+ "exit code: %d\n", WEXITSTATUS (status));
|
|
35
|
|
- }
|
|
36
|
|
--
|
|
37
|
|
-- fd_str = g_strdup_printf ("%d", keyring_lifetime_pipe[0]);
|
|
38
|
|
-- g_setenv ("GNOME_KEYRING_LIFETIME_FD", fd_str, TRUE);
|
|
39
|
|
-- g_free (fd_str);
|
|
40
|
|
- }
|
|
41
|
|
-
|
|
42
|
|
--
|
|
43
|
|
- static void
|
|
44
|
|
- gnome_keyring_daemon_startup (void)
|
|
45
|
|
- {
|
|
46
|
|
- GError *error = NULL;
|
|
47
|
|
-- gchar *sout;
|
|
48
|
|
-- gchar **lines;
|
|
49
|
|
-- gsize lineno;
|
|
50
|
|
-- gint status;
|
|
51
|
|
-- glong pid;
|
|
52
|
|
-- gchar *end;
|
|
53
|
|
-+ GPid pid;
|
|
54
|
|
- gchar *argv[3];
|
|
55
|
|
-- gchar *p;
|
|
56
|
|
-- gchar *name;
|
|
57
|
|
-- const gchar *value;
|
|
58
|
|
--
|
|
59
|
|
-- /* Pipe to slave keyring lifetime to */
|
|
60
|
|
-- if (pipe (keyring_lifetime_pipe))
|
|
61
|
|
-- {
|
|
62
|
|
-- g_warning ("Failed to set up pipe for gnome-keyring: %s", strerror (errno));
|
|
63
|
|
-- return;
|
|
64
|
|
-- }
|
|
65
|
|
-
|
|
66
|
|
- error = NULL;
|
|
67
|
|
- argv[0] = GNOME_KEYRING_DAEMON;
|
|
68
|
|
- argv[1] = "--start";
|
|
69
|
|
- argv[2] = NULL;
|
|
70
|
|
-- g_spawn_sync (NULL, argv, NULL,
|
|
71
|
|
-- G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
|
|
72
|
|
-- child_setup, NULL,
|
|
73
|
|
-- &sout, NULL, &status, &error);
|
|
74
|
|
--
|
|
75
|
|
-- close (keyring_lifetime_pipe[0]);
|
|
76
|
|
-- /* We leave keyring_lifetime_pipe[1] open for the lifetime of the session,
|
|
77
|
|
-- in order to slave the keyring daemon lifecycle to the session. */
|
|
78
|
|
-+ g_spawn_async (NULL, argv, NULL,
|
|
79
|
|
-+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
|
|
80
|
|
-+ NULL, NULL, &pid,
|
|
81
|
|
-+ &error);
|
|
82
|
|
-
|
|
83
|
|
- if (error != NULL)
|
|
84
|
|
- {
|
|
85
|
|
-- g_printerr ("Failed to run gnome-keyring-daemon: %s\n",
|
|
86
|
|
-+ g_printerr ("Failed to spawn gnome-keyring-daemon: %s\n",
|
|
87
|
|
- error->message);
|
|
88
|
|
- g_error_free (error);
|
|
89
|
|
-+ return;
|
|
90
|
|
- }
|
|
91
|
|
-- else
|
|
92
|
|
-- {
|
|
93
|
|
-- if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
|
|
94
|
|
-- {
|
|
95
|
|
-- lines = g_strsplit (sout, "\n", 0);
|
|
96
|
|
--
|
|
97
|
|
-- for (lineno = 0; lines[lineno] != NULL; lineno++)
|
|
98
|
|
-- {
|
|
99
|
|
-- p = strchr (lines[lineno], '=');
|
|
100
|
|
-- if (p == NULL)
|
|
101
|
|
-- continue;
|
|
102
|
|
--
|
|
103
|
|
-- name = g_strndup (lines[lineno], p - lines[lineno]);
|
|
104
|
|
-- value = p + 1;
|
|
105
|
|
--
|
|
106
|
|
-- g_setenv (name, value, TRUE);
|
|
107
|
|
--
|
|
108
|
|
-- if (g_strcmp0 (name, "GNOME_KEYRING_PID") == 0)
|
|
109
|
|
-- {
|
|
110
|
|
-- pid = strtol (value, &end, 10);
|
|
111
|
|
-- if (end != value)
|
|
112
|
|
-- gnome_keyring_daemon_pid = pid;
|
|
113
|
|
-- }
|
|
114
|
|
--
|
|
115
|
|
-- g_free (name);
|
|
116
|
|
-- }
|
|
117
|
|
--
|
|
118
|
|
-- g_strfreev (lines);
|
|
119
|
|
-- }
|
|
120
|
|
-- else
|
|
121
|
|
-- {
|
|
122
|
|
-- /* daemon failed for some reason */
|
|
123
|
|
-- g_printerr ("gnome-keyring-daemon failed to start correctly, "
|
|
124
|
|
-- "exit code: %d\n", WEXITSTATUS (status));
|
|
125
|
|
-- }
|
|
126
|
|
--
|
|
127
|
|
-- g_free (sout);
|
|
128
|
|
-- }
|
|
129
|
|
--}
|
|
130
|
|
-
|
|
131
|
|
--static void
|
|
132
|
|
--gnome_keyring_daemon_shutdown (void)
|
|
133
|
|
--{
|
|
134
|
|
-- if (gnome_keyring_daemon_pid != 0)
|
|
135
|
|
-- {
|
|
136
|
|
-- kill (gnome_keyring_daemon_pid, SIGTERM);
|
|
137
|
|
-- gnome_keyring_daemon_pid = 0;
|
|
138
|
|
-- }
|
|
139
|
|
-+ g_child_watch_add (pid, gnome_keyring_daemon_finished, NULL);
|
|
140
|
|
- }
|
|
141
|
|
-
|
|
142
|
|
-
|
|
143
|
|
-@@ -263,9 +190,6 @@ msm_gnome_stop (void)
|
|
144
|
|
-
|
|
145
|
|
- g_debug ("MsmGnome: stopping");
|
|
146
|
|
-
|
|
147
|
|
-- /* shutdown the keyring daemon */
|
|
148
|
|
-- gnome_keyring_daemon_shutdown ();
|
|
149
|
|
--
|
|
150
|
|
- msm_compat_gnome_smproxy_shutdown ();
|
|
151
|
|
-
|
|
152
|
|
- gnome_compat_started = FALSE;
|