diff options
| author | Werner Koch <[email protected]> | 2019-12-10 08:35:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-12-23 11:40:43 +0000 |
| commit | 8a556c23a29776b2b5aa1d563e779b6ae0139dff (patch) | |
| tree | 5c9aa9c8cdfec0b9abc62ce49ebb43dd05d3a43d /kbx/keyboxd.c | |
| parent | scd: Enhance KEYINFO command to limit listing with capability. (diff) | |
| download | gnupg-8a556c23a29776b2b5aa1d563e779b6ae0139dff.tar.gz gnupg-8a556c23a29776b2b5aa1d563e779b6ae0139dff.zip | |
kbx: Change keyboxd to work only with one database.
* kbx/frontend.c (the_database): New var.
(db_desc_t): Remove.
(kbxd_add_resource): Renamed to ...
(kbxd_set_database): this. Simplify.
(kbxd_search): Change to use only one database.
(kbxd_store): Ditto.
(kbxd_delete): Ditto.
--
The original implementation was way to complicated and would have only
brought back the problems deciding which database to use for each key.
The new scheme used one configured database and only that. That
database needs to be set right at the start.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keyboxd.c')
| -rw-r--r-- | kbx/keyboxd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c index d39b35749..25a97e9a3 100644 --- a/kbx/keyboxd.c +++ b/kbx/keyboxd.c @@ -736,7 +736,7 @@ main (int argc, char **argv ) } kbxd_init_default_ctrl (ctrl); - kbxd_add_resource (ctrl, "pubring.kbx", 0); + kbxd_set_database (ctrl, "pubring.kbx", 0); kbxd_start_command_handler (ctrl, GNUPG_INVALID_FD, 0); kbxd_deinit_default_ctrl (ctrl); @@ -870,7 +870,7 @@ main (int argc, char **argv ) kbxd_exit (1); } kbxd_init_default_ctrl (ctrl); - kbxd_add_resource (ctrl, "pubring.kbx", 0); + kbxd_set_database (ctrl, "pubring.kbx", 0); kbxd_deinit_default_ctrl (ctrl); xfree (ctrl); } |