aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-09-05 14:13:41 +0000
committerWerner Koch <[email protected]>2016-09-05 14:24:14 +0000
commit0b99d1fd2a80b8efaacc731027d2b2ecd9eca699 (patch)
treeafbfc162648bbd133b749598dd2f36cb63f678fd /agent/gpg-agent.c
parentagent: Small improvement of the server's local state. (diff)
downloadgnupg-0b99d1fd2a80b8efaacc731027d2b2ecd9eca699.tar.gz
gnupg-0b99d1fd2a80b8efaacc731027d2b2ecd9eca699.zip
agent: Silence --debug IPC output for connections from self.
* agent/command.c (server_local_s): Add fields 'greeting_seen' and 'connect_from_self'. (io_monitor): Do not log connections from self. (start_command_handler): Set flag 'connect_from_self'. * agent/gpg-agent.c (check_own_socket_thread): Disable logging. (do_start_connection_thread): Do not log conection start and termination if IPC debugging is enabled. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--agent/gpg-agent.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 79c83a5d3..e119975ea 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2303,12 +2303,12 @@ do_start_connection_thread (ctrl_t ctrl)
{
active_connections++;
agent_init_default_ctrl (ctrl);
- if (opt.verbose)
+ if (opt.verbose && !DBG_IPC)
log_info (_("handler 0x%lx for fd %d started\n"),
(unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
- if (opt.verbose)
+ if (opt.verbose && !DBG_IPC)
log_info (_("handler 0x%lx for fd %d terminated\n"),
(unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
@@ -2657,6 +2657,7 @@ check_own_socket_thread (void *arg)
log_error ("can't allocate assuan context: %s\n", gpg_strerror (rc));
goto leave;
}
+ assuan_set_flag (ctx, ASSUAN_NO_LOGGING, 1);
rc = assuan_socket_connect (ctx, sockname, (pid_t)(-1), 0);
if (rc)