diff options
| author | Werner Koch <wk@gnupg.org> | 2022-10-07 15:01:02 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2022-10-07 15:01:14 +0200 |
| commit | 4364283f757fceab454d48d461a9f88c31247a07 (patch) | |
| tree | d758e3b78879d7f05b18d374bbeafe910a9f1186 /tools/gpg-wks-client.c | |
| parent | common: Protect against a theoretical integer overflow in tlv.c (diff) | |
| download | gnupg2-4364283f757fceab454d48d461a9f88c31247a07.tar.xz gnupg2-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/gpg-wks-client.c')
| -rw-r--r-- | tools/gpg-wks-client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c index c90e86373..25b14738d 100644 --- a/tools/gpg-wks-client.c +++ b/tools/gpg-wks-client.c @@ -544,9 +544,9 @@ add_user_id (const char *fingerprint, 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, "--always-trust"); @@ -633,9 +633,9 @@ decrypt_stream (estream_t *r_output, struct decrypt_stream_parm_s *decinfo, * tricks. A regular client will anyway only send a minimal key; * that is one w/o key signatures and attribute packets. */ ccparray_put (&ccp, "--max-output=0x10000"); - 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"); @@ -1280,9 +1280,9 @@ encrypt_response (estream_t *r_output, estream_t input, 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"); @@ -1703,7 +1703,7 @@ mirror_one_keys_userid (estream_t key, const char *mbox, uidinfo_list_t uidlist, } err = wks_install_key_core (newkey? newkey : key, mbox); - if (!opt.quiet) + if (opt.verbose) log_info ("key %s published for '%s'\n", fpr, mbox); mirror_one_key_parm.nuids++; if (!opt.quiet && !(mirror_one_key_parm.nuids % 25)) |