diff options
| author | NIIBE Yutaka <[email protected]> | 2025-10-14 07:45:08 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2025-10-21 04:19:25 +0000 |
| commit | 4050139d46fba2b50d95cd404ceb39c72efd1bb2 (patch) | |
| tree | 17617c2892d379bf63879cb57c32c43c47ce183c /g10/keydb.c | |
| parent | common,w32: Always use share mode readwrite for the keybox. (diff) | |
| download | gnupg-4050139d46fba2b50d95cd404ceb39c72efd1bb2.tar.gz gnupg-4050139d46fba2b50d95cd404ceb39c72efd1bb2.zip | |
gpg: Minor clean up for keydb_lock API.
* g10/keydb-private.h (internal_keydb_lock): Remove.
* g10/keydb.c (internal_keydb_lock): It's internal function.
* g10/call-keyboxd.c (keydb_lock): Move to...
* g10/keydb.c (keydb_lock): ... here.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/keydb.c')
| -rw-r--r-- | g10/keydb.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/g10/keydb.c b/g10/keydb.c index 590b45713..f155d8e7a 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -929,7 +929,7 @@ internal_keydb_deinit (KEYDB_HANDLE hd) /* Take a lock on the files immediately and not only during insert or * update. This lock is released with keydb_release. */ -gpg_error_t +static gpg_error_t internal_keydb_lock (KEYDB_HANDLE hd) { gpg_error_t err; @@ -944,6 +944,20 @@ internal_keydb_lock (KEYDB_HANDLE hd) } +/* Take a lock if we are not using the keyboxd. */ +gpg_error_t +keydb_lock (KEYDB_HANDLE hd) +{ + if (!hd) + return gpg_error (GPG_ERR_INV_ARG); + + if (!hd->use_keyboxd) + return internal_keydb_lock (hd); + + return 0; +} + + /* Set a flag on the handle to suppress use of cached results. This * is required for updating a keyring and for key listings. Fixme: * Using a new parameter for keydb_new might be a better solution. */ |