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/import.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/import.c')
| -rw-r--r-- | sm/import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sm/import.c b/sm/import.c index bd1af27a2..4a8ecf73c 100644 --- a/sm/import.c +++ b/sm/import.c @@ -199,7 +199,7 @@ check_and_store (ctrl_t ctrl, struct stats_s *stats, { int existed; - if (!keydb_store_cert (cert, 0, &existed)) + if (!keydb_store_cert (ctrl, cert, 0, &existed)) { ksba_cert_t next = NULL; @@ -442,7 +442,7 @@ reimport_one (ctrl_t ctrl, struct stats_s *stats, int in_fd) } keydb_search_reset (kh); - err = keydb_search (kh, &desc, 1); + err = keydb_search (ctrl, kh, &desc, 1); if (err) { print_import_problem (ctrl, NULL, 0); @@ -476,7 +476,7 @@ reimport_one (ctrl_t ctrl, struct stats_s *stats, int in_fd) continue; } - err = keydb_set_cert_flags (cert, 1, KEYBOX_FLAG_BLOB, 0, + err = keydb_set_cert_flags (ctrl, cert, 1, KEYBOX_FLAG_BLOB, 0, KEYBOX_FLAG_BLOB_EPHEMERAL, 0); if (err) { |