summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2022-04-20 09:20:35 +0200
committerWerner Koch <wk@gnupg.org>2022-04-20 09:30:56 +0200
commit22fef189b1113581994972c06ecb216a888f3d74 (patch)
tree45060cd4dc7a56fcdfc805e734eed84b783202ee /g10
parentgpg: Replace an assert by a log_fatal. (diff)
downloadgnupg2-22fef189b1113581994972c06ecb216a888f3d74.tar.xz
gnupg2-22fef189b1113581994972c06ecb216a888f3d74.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 file 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 'g10')
-rw-r--r--g10/gpg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 2c3cd925f..466a48d9d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2422,7 +2422,7 @@ main (int argc, char **argv)
gnupg_rl_initialize ();
gpgrt_set_strusage (my_strusage);
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
- log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX);
+ log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
/* Make sure that our subsystems are ready. */
i18n_init();