diff options
| author | Stef Walter <stefw@gnome.org> | 2014-03-06 21:18:38 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-03-06 21:20:19 +0100 |
| commit | 90a3ae6656960b36a1d2277f336222bd49d5eece (patch) | |
| tree | 223193316c52f92c1643fb08511d74668be0d5ea /pam/gkr-pam-client.c | |
| parent | 2ca51a0aef5b1bc41f2e71d2b65edc8478dab69d (diff) | |
| download | gnome-keyring-90a3ae6656960b36a1d2277f336222bd49d5eece.tar.gz | |
daemon: Stop exposing a GNOME_KEYRING_PID variable
We exit with the DBus session bus. Remove this clutter from the
environment. PAM module no longer cares about the lifetime of
the deamon, except in one case: where it started the daemon in
order to change a password and the auto_start argument wasn't set.
https://bugzilla.gnome.org/show_bug.cgi?id=725801
Diffstat (limited to 'pam/gkr-pam-client.c')
| -rw-r--r-- | pam/gkr-pam-client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pam/gkr-pam-client.c b/pam/gkr-pam-client.c index d2ce8b59..5c92cec5 100644 --- a/pam/gkr-pam-client.c +++ b/pam/gkr-pam-client.c @@ -310,7 +310,9 @@ keyring_daemon_op (struct sockaddr_un *addr, * and an empty (only result code) return. */ - assert (op == GKD_CONTROL_OP_CHANGE || op == GKD_CONTROL_OP_UNLOCK); + assert (op == GKD_CONTROL_OP_CHANGE || + op == GKD_CONTROL_OP_UNLOCK || + op == GKD_CONTROL_OP_QUIT); ret = connect_daemon (addr, &sock); if (ret != GKD_CONTROL_RESULT_OK) |