diff options
| author | Stef Walter <stefw@redhat.com> | 2014-08-29 15:34:46 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2016-02-20 16:17:21 +0100 |
| commit | 7a662adac193349f3b224d221d5c06960e318b99 (patch) | |
| tree | f2eacd334fab112293d4687e4269ba17dc6a8765 | |
| parent | 5e02b98ecb1056aaaf9519023687bd9ac81325ce (diff) | |
| download | gnome-keyring-7a662adac193349f3b224d221d5c06960e318b99.tar.gz | |
More work
| -rw-r--r-- | daemon/ssh-agent/gkd-ssh-agent-client.c (renamed from daemon/ssh-agent/gkd-ssh-agent-process.c) | 4 | ||||
| -rw-r--r-- | daemon/ssh-agent/gkd-ssh-agent-client.h | 2 | ||||
| -rw-r--r-- | daemon/ssh-agent/gkd-ssh-agent-ops.c | 2 | ||||
| -rw-r--r-- | daemon/ssh-agent/gkd-ssh-agent.c | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/daemon/ssh-agent/gkd-ssh-agent-process.c b/daemon/ssh-agent/gkd-ssh-agent-client.c index 3e4acb2f..2f4b3407 100644 --- a/daemon/ssh-agent/gkd-ssh-agent-process.c +++ b/daemon/ssh-agent/gkd-ssh-agent-client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Red Hat Inc. + * Copyright (C) 2014 Stef Walter * * Gnome keyring is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Author: Stef Walter <stefw@redhat.com> + * Author: Stef Walter <stef@thewalter.net> */ #include "config.h" diff --git a/daemon/ssh-agent/gkd-ssh-agent-client.h b/daemon/ssh-agent/gkd-ssh-agent-client.h index c3cd135d..4328fe46 100644 --- a/daemon/ssh-agent/gkd-ssh-agent-client.h +++ b/daemon/ssh-agent/gkd-ssh-agent-client.h @@ -42,7 +42,7 @@ GType gkd_ssh_agent_client_get_type (void); GkdSshAgentClient * gkd_ssh_agent_client_connect (void); -gboolean gkd_ssh_agent_client_call (GkdSshAgentClient *self, +gboolean gkd_ssh_agent_client_transact (GkdSshAgentClient *self, EggBuffer *req, EggBuffer *resp); diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c index c2b02a76..6636c4e6 100644 --- a/daemon/ssh-agent/gkd-ssh-agent-ops.c +++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c @@ -174,7 +174,7 @@ preload_key_if_necessary (GkdSshAgentClient *agent, blob = g_bytes_get_data (priv, &length); egg_buffer_add_byte_array (&buf, blob, length); - if (gkd_ssh_agent_client_call (agent, &buf, &buf)) { + if (gkd_ssh_agent_client_transact (agent, &buf, &buf)) { if (!egg_buffer_get_byte (&buf, 4, NULL, &code) || code != GKD_SSH_RES_SUCCESS) { comment = gkd_ssh_agent_client_preload_comment (agent, key); g_warning ("couldn't add private key '%s' to ssh-agent", comment); diff --git a/daemon/ssh-agent/gkd-ssh-agent.c b/daemon/ssh-agent/gkd-ssh-agent.c index 5245034a..8d64ef38 100644 --- a/daemon/ssh-agent/gkd-ssh-agent.c +++ b/daemon/ssh-agent/gkd-ssh-agent.c @@ -134,6 +134,12 @@ gkd_ssh_agent_write_packet (gint fd, return write_all (fd, buffer->buf, buffer->len); } +gboolean +gkd_ssh_agent_relay (GkdSshAgentCall *call) +{ + return gkd_ssh_agent_client_transact (call->agent, call->req, call->resp); +} + static gpointer run_client_thread (gpointer data) { |