diff options
| author | Werner Koch <[email protected]> | 2022-04-20 07:20:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-04-20 07:20:35 +0000 |
| commit | a5faaf8bee43e1e8d99cf3c08fad8ccce047fc28 (patch) | |
| tree | 92b17e70833d0846a77d3232a8c5d5c6ac2016dc /tools/gpgconf.c | |
| parent | Prepare NEWS for the next release (diff) | |
| download | gnupg-a5faaf8bee43e1e8d99cf3c08fad8ccce047fc28.tar.gz gnupg-a5faaf8bee43e1e8d99cf3c08fad8ccce047fc28.zip | |
w32: Do no use Registry item DefaultLogFile for the main tools.
* g10/gpg.c (main): Set LOG_NO_REGISTRY.
* sm/gpgsm.c (main): Ditto.
* tools/gpg-connect-agent.c (main): Ditto.
* tools/gpgconf.c (main): Ditto.
(show_other_registry_entries): Print "DefaultLogFile".
--
The intention of this mostly forgotten registry entry was to allow for
easy debugging of the tools. However, with the global config
files (and in 2.3 with common.conf) things are anyway better. We
disable the use for the commonly used tools so that it does not look
like calling gpg on the command line seems to block with no output if
the log server (e.g. tcp://1.2.3.4:11111) is not reachable.
Diffstat (limited to 'tools/gpgconf.c')
| -rw-r--r-- | tools/gpgconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 0783b4370..f1d823cb6 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -609,7 +609,7 @@ main (int argc, char **argv) early_system_init (); gnupg_reopen_std (GPGCONF_NAME); set_strusage (my_strusage); - log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX); + log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY); /* Make sure that our subsystems are ready. */ i18n_init(); @@ -1284,6 +1284,7 @@ show_other_registry_entries (estream_t outfp) { 1, "HKLM\\Software\\Gpg4win:Desktop-Version" }, { 1, "HKLM\\Software\\Gpg4win:VS-Desktop-Version" }, { 1, "\\" GNUPG_REGISTRY_DIR ":HomeDir" }, + { 1, "\\" GNUPG_REGISTRY_DIR ":DefaultLogFile" }, { 2, "Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL" ":LoadBehavior" }, { 2, "HKCU\\Software\\Microsoft\\Office\\16.0\\Outlook\\Options\\Mail:" |