diff options
| author | Werner Koch <wk@gnupg.org> | 2024-05-16 09:46:36 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2024-05-16 09:46:36 +0200 |
| commit | 287e717b55d2045b486a4986e39777d3871e6377 (patch) | |
| tree | f528422007c3675acc31bab380b9d0c4a7d74b16 /kbx | |
| parent | gpg: Terminate key listing on output write error. (diff) | |
| parent | card: Fix compiler warning. (diff) | |
| download | gnupg2-287e717b55d2045b486a4986e39777d3871e6377.tar.xz gnupg2-287e717b55d2045b486a4986e39777d3871e6377.zip | |
Merge branch 'STABLE-BRANCH-2-4' into master
--
Fixed conflicts in:
NEWS
g10/call-agent.c
g10/options.h
kbx/kbxutil.c
tools/gpgconf.c
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 5a0543128..c7ac5b852 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -457,6 +457,7 @@ main (int argc, char **argv) /* Make sure that our subsystems are ready. */ i18n_init (); init_common_subsystems (&argc, &argv); + setup_libgcrypt_logging (); /*create_dotlock(NULL); register locking cleanup */ |