diff options
| author | Werner Koch <[email protected]> | 2016-11-10 16:01:19 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-11-10 16:07:28 +0000 |
| commit | 5d13581f4737c18430f6572dd4ef486d1ad80dd1 (patch) | |
| tree | d90f1618778b7534bb195aa7c09060cb631484dd /sm/delete.c | |
| parent | sm: Remove unused arg SECRET from keydb functions. (diff) | |
| download | gnupg-5d13581f4737c18430f6572dd4ef486d1ad80dd1.tar.gz gnupg-5d13581f4737c18430f6572dd4ef486d1ad80dd1.zip | |
gpg,sm: Add STATUS_ERROR keydb_search and keydb_add-resource.
* g10/keydb.c (keydb_add_resource): Make ANY_REGISTERED
file-global. Write a STATUS_ERROR.
(maybe_create_keyring_or_box): Check for non-accessible but existant
file.
(keydb_search): Write a STATUS_ERROR if no keyring has been registered
but continue to return NOT_FOUND.
* sm/keydb.c (keydb_add_resource): Rename ANY_PUBLIC to ANY_REGISTERED
and make file-global. Write a STATUS_ERROR.
(keydb_search): Write a STATUS_ERROR if no keyring has been registered
but continue to return NOT_FOUND. Also add new arg CTRL and change
all callers to pass it down.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'sm/delete.c')
| -rw-r--r-- | sm/delete.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sm/delete.c b/sm/delete.c index ae06261a2..35369683b 100644 --- a/sm/delete.c +++ b/sm/delete.c @@ -72,7 +72,7 @@ delete_one (ctrl_t ctrl, const char *username) keydb_set_ephemeral (kh, 1); } - rc = keydb_search (kh, &desc, 1); + rc = keydb_search (ctrl, kh, &desc, 1); if (!rc) rc = keydb_get_cert (kh, &cert); if (!rc && !is_ephem) @@ -82,7 +82,7 @@ delete_one (ctrl_t ctrl, const char *username) gpgsm_get_fingerprint (cert, 0, fpr, NULL); next_ambigious: - rc = keydb_search (kh, &desc, 1); + rc = keydb_search (ctrl, kh, &desc, 1); if (rc == -1) rc = 0; else if (!rc) @@ -126,7 +126,7 @@ delete_one (ctrl_t ctrl, const char *username) do { keydb_search_reset (kh); - rc = keydb_search (kh, &desc, 1); + rc = keydb_search (ctrl, kh, &desc, 1); if (rc) { log_error ("problem re-searching certificate: %s\n", |