summaryrefslogtreecommitdiffstats
path: root/kbx/keybox.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-08-03 15:31:27 +0200
committerWerner Koch <wk@gnupg.org>2016-08-03 15:31:27 +0200
commit48a2c93a1886589d1a0e2a4a2173e0e81311200b (patch)
tree80cee1c6eb19941ab9676482f9eb4984d7360e83 /kbx/keybox.h
parentcommon: New file utilproto.c (diff)
downloadgnupg2-48a2c93a1886589d1a0e2a4a2173e0e81311200b.tar.xz
gnupg2-48a2c93a1886589d1a0e2a4a2173e0e81311200b.zip
gpg,gpgsm: Block signals during keyring/keybox update.
* kbx/keybox-util.c (keybox_file_rename): Add arg BLOCK_SIGNALS. * kbx/keybox-update.c (rename_tmp_file): Block all signals when doing a double rename. * g10/keyring.c (rename_tmp_file): Block all signals during the double rename. -- This might fix Debian-bug-id: 831510 Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'kbx/keybox.h')
-rw-r--r--kbx/keybox.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kbx/keybox.h b/kbx/keybox.h
index bfc358620..6180a2fd7 100644
--- a/kbx/keybox.h
+++ b/kbx/keybox.h
@@ -134,7 +134,8 @@ void keybox_set_malloc_hooks ( void *(*new_alloc_func)(size_t n),
gpg_error_t keybox_tmp_names (const char *filename, int for_keyring,
char **r_bakname, char **r_tmpname);
-gpg_error_t keybox_file_rename (const char *oldname, const char *newname);
+gpg_error_t keybox_file_rename (const char *oldname, const char *newname,
+ int *block_signals);
#ifdef __cplusplus