aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-12-01 09:45:06 +0000
committerWerner Koch <[email protected]>2014-12-01 09:45:06 +0000
commit2f90b7c21b2f84ca2bf5f4555da9233e84606b4e (patch)
tree13b6df2c24b8c46f1377e6cd65dcaad3c2478986 /agent/gpg-agent.c
parentdirmngr: Implement socket redirection. (diff)
downloadgnupg-2f90b7c21b2f84ca2bf5f4555da9233e84606b4e.tar.gz
gnupg-2f90b7c21b2f84ca2bf5f4555da9233e84606b4e.zip
scd: Implement socket redirection.
* scd/scdaemon.c (ENAMETOOLONG): New. (redir_socket_name): New. (cleanup): Take care of a redirected socket. (main): Pass redir_socket_name to create_server_socket. (create_socket_name): Remove superfluous length check. (create_server_socket): Add arg r_redir_name and implement redirection. Replace assert for older Assuan by an error message. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
-rw-r--r--agent/gpg-agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 7576cf93c..de40e3b4e 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1525,8 +1525,8 @@ create_socket_name (char *standard_name, int with_homedir)
/* Create a Unix domain socket with NAME. Returns the file descriptor
or terminates the process in case of an error. Note that this
function needs to be used for the regular socket first (indicated
- by PRIMARY) and only then for the extra and the ssh sockets. if
- the soecket has been redirected the name of the real socket is
+ by PRIMARY) and only then for the extra and the ssh sockets. If
+ the socket has been redirected the name of the real socket is
stored as a malloced string at R_REDIR_NAME. */
static gnupg_fd_t
create_server_socket (char *name, int primary,