diff options
| author | Werner Koch <[email protected]> | 2019-05-14 11:36:08 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-05-14 11:36:08 +0000 |
| commit | 22e274f839f9a6c9a511648f29cae497f6492c97 (patch) | |
| tree | c1919fa1f95a1a95f23079271ffc2480c115a546 /sm/delete.c | |
| parent | agent: Replace most assert by log_assert. (diff) | |
| download | gnupg-22e274f839f9a6c9a511648f29cae497f6492c97.tar.gz gnupg-22e274f839f9a6c9a511648f29cae497f6492c97.zip | |
sm: Change keydb code to use the keybox locking.
* kbx/keybox-init.c (keybox_lock): New arg TIMEOUT. Change all
callers to pass -1 when locking.
* sm/keydb.c (struct resource_item): Remove LOCKANDLE.
(struct keydb_handle): Add KEEP_LOCK.
(keydb_add_resource): Use keybox locking instead of a separate dotlock
for testing whether we can run a compress.
(keydb_release): Reset KEEP_LOCK.
(keydb_lock): Set KEEP_LOCK.
(unlock_all): Take care of KEEP_LOCK.
(lock_all): Use keybox_lock instead of dotlock fucntions.
(keydb_delete): Remove arg UNLOCK.
* sm/delete.c (delete_one): Adjust keydb_delete. Due to the KEEP_LOCK
the keydb_release takes care of unlocking.
--
This aligns the code more with g10/keydb.c and avoids the separate
calls to dotlock_take.
GnuPG-bug-id: 4505
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'sm/delete.c')
| -rw-r--r-- | sm/delete.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sm/delete.c b/sm/delete.c index f359cc595..b370406de 100644 --- a/sm/delete.c +++ b/sm/delete.c @@ -113,7 +113,8 @@ delete_one (ctrl_t ctrl, const char *username) goto leave; } - /* We need to search again to get back to the right position. */ + /* We need to search again to get back to the right position. Neo + * that the lock is kept until the KH is released. */ rc = keydb_lock (kh); if (rc) { @@ -132,7 +133,7 @@ delete_one (ctrl_t ctrl, const char *username) goto leave; } - rc = keydb_delete (kh, duplicates ? 0 : 1); + rc = keydb_delete (kh); if (rc) goto leave; if (opt.verbose) |