diff options
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 5b1a124e0..ae1295977 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -2877,9 +2877,8 @@ start_connection_thread_std (void *arg) if (check_nonce (ctrl, &socket_nonce)) { - log_error ("handler 0x%lx for fd %d FAILED nonce check\n", - (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd)); - assuan_sock_close (ctrl->thread_startup.fd); + log_error ("handler 0x%lx nonce check FAILED\n", + (unsigned long) npth_self()); return NULL; } @@ -2895,9 +2894,8 @@ start_connection_thread_extra (void *arg) if (check_nonce (ctrl, &socket_nonce_extra)) { - log_error ("handler 0x%lx for fd %d FAILED nonce check\n", - (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd)); - assuan_sock_close (ctrl->thread_startup.fd); + log_error ("handler 0x%lx nonce check FAILED\n", + (unsigned long) npth_self()); return NULL; } @@ -2914,9 +2912,8 @@ start_connection_thread_browser (void *arg) if (check_nonce (ctrl, &socket_nonce_browser)) { - log_error ("handler 0x%lx for fd %d FAILED nonce check\n", - (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd)); - assuan_sock_close (ctrl->thread_startup.fd); + log_error ("handler 0x%lx nonce check FAILED\n", + (unsigned long) npth_self()); return NULL; } @@ -2932,10 +2929,7 @@ start_connection_thread_ssh (void *arg) ctrl_t ctrl = arg; if (check_nonce (ctrl, &socket_nonce_ssh)) - { - assuan_sock_close (ctrl->thread_startup.fd); - return NULL; - } + return NULL; active_connections++; agent_init_default_ctrl (ctrl); |