diff options
| author | NIIBE Yutaka <[email protected]> | 2023-12-18 02:25:01 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-12-18 02:25:01 +0000 |
| commit | 4e94b004a69e63512e4e37858840614b3e062122 (patch) | |
| tree | 817d9b55645076fd74325f8ac862b81650dde425 | |
| parent | doc: Fix description of scdaemon for --disable-ccid. (diff) | |
| download | gnupg-4e94b004a69e63512e4e37858840614b3e062122.tar.gz gnupg-4e94b004a69e63512e4e37858840614b3e062122.zip | |
scd: Debug output is only enabled with an option.
* scd/command.c (pin_cb): Check if DBG_IPC for log_debug.
(send_client_notifications): Check opt.verbose to output a message.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | scd/command.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/scd/command.c b/scd/command.c index 9ce3889d2..a2274f15a 100644 --- a/scd/command.c +++ b/scd/command.c @@ -957,7 +957,8 @@ pin_cb (void *opaque, const char *info, char **retstr) We ignore any value returned. */ if (info) { - log_debug ("prompting for pinpad entry '%s'\n", info); + if (DBG_IPC) + log_debug ("prompting for pinpad entry '%s'\n", info); rc = gpgrt_asprintf (&command, "POPUPPINPADPROMPT %s", info); if (rc < 0) return gpg_error (gpg_err_code_from_errno (errno)); @@ -966,7 +967,8 @@ pin_cb (void *opaque, const char *info, char **retstr) } else { - log_debug ("dismiss pinpad entry prompt\n"); + if (DBG_IPC) + log_debug ("dismiss pinpad entry prompt\n"); rc = assuan_inquire (ctx, "DISMISSPINPADPROMPT", &value, &valuelen, MAXLEN_PIN); } @@ -976,7 +978,8 @@ pin_cb (void *opaque, const char *info, char **retstr) } *retstr = NULL; - log_debug ("asking for PIN '%s'\n", info); + if (DBG_IPC) + log_debug ("asking for PIN '%s'\n", info); rc = gpgrt_asprintf (&command, "NEEDPIN %s", info); if (rc < 0) @@ -2989,12 +2992,16 @@ send_client_notifications (card_t card, int removal) if (killed[kidx].handle == handle) break; if (kidx < killidx) - log_info ("event %p already triggered for client\n", - sl->event_signal); + { + if (opt.verbose) + log_info ("event %p already triggered for client\n", + sl->event_signal); + } else { - log_info ("triggering event %p for client\n", - sl->event_signal); + if (opt.verbose) + log_info ("triggering event %p for client\n", + sl->event_signal); if (!SetEvent (handle)) log_error ("SetEvent(%p) failed: %s\n", sl->event_signal, w32_strerror (-1)); @@ -3015,12 +3022,16 @@ send_client_notifications (card_t card, int removal) && killed[kidx].signo == signo) break; if (kidx < killidx) - log_info ("signal %d already sent to client %d\n", - signo, (int)pid); + { + if (opt.verbose) + log_info ("signal %d already sent to client %d\n", + signo, (int)pid); + } else { - log_info ("sending signal %d to client %d\n", - signo, (int)pid); + if (opt.verbose) + log_info ("sending signal %d to client %d\n", + signo, (int)pid); kill (pid, signo); if (killidx < DIM (killed)) { |