diff options
| author | Werner Koch <[email protected]> | 2022-10-07 13:01:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-10-07 13:01:14 +0000 |
| commit | 4364283f757fceab454d48d461a9f88c31247a07 (patch) | |
| tree | d758e3b78879d7f05b18d374bbeafe910a9f1186 /tools/wks-util.c | |
| parent | common: Protect against a theoretical integer overflow in tlv.c (diff) | |
| download | gnupg-4364283f757fceab454d48d461a9f88c31247a07.tar.gz gnupg-4364283f757fceab454d48d461a9f88c31247a07.zip | |
wkd: Silence gpg-wks-client diagnostics from gpg.
* tools/gpg-wks-client.c (add_user_id): PAss --quiet to gpg unless we
are running in double verbose mode.
(decrypt_stream): Ditto
(encrypt_response): Ditto.
(mirror_one_keys_userid): Ditto.
* tools/wks-util.c (wks_get_key): Ditto.
(wks_list_key): Ditto.
(wks_filter_uid): Ditto.
Diffstat (limited to 'tools/wks-util.c')
| -rw-r--r-- | tools/wks-util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/wks-util.c b/tools/wks-util.c index e1d08b9ed..a1640d772 100644 --- a/tools/wks-util.c +++ b/tools/wks-util.c @@ -216,9 +216,9 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec, ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); @@ -313,9 +313,9 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes) ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); @@ -489,9 +489,9 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid, ccparray_init (&ccp, 0); ccparray_put (&ccp, "--no-options"); - if (!opt.verbose) + if (opt.verbose < 2) ccparray_put (&ccp, "--quiet"); - else if (opt.verbose > 1) + else ccparray_put (&ccp, "--verbose"); ccparray_put (&ccp, "--batch"); ccparray_put (&ccp, "--status-fd=2"); |