diff options
| author | Werner Koch <[email protected]> | 2022-10-04 10:44:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-10-04 10:44:29 +0000 |
| commit | 4de98d4468f37bfb8352426830d5d5642ded7536 (patch) | |
| tree | 023a4f1088e41e5b8bff7855269cc1a76f3f5813 /dirmngr/ks-action.c | |
| parent | gpg: Show just keyserver and port with --send-keys. (diff) | |
| download | gnupg-4de98d4468f37bfb8352426830d5d5642ded7536.tar.gz gnupg-4de98d4468f37bfb8352426830d5d5642ded7536.zip | |
dirmngr: New options --first and --next for KS_GET.
* dirmngr/server.c (cmd_ks_get): Add option --first and --next.
(start_command_handler): Free that new ldap state.
* dirmngr/ks-engine-ldap.c (struct ks_engine_ldap_local_s): New.
(ks_ldap_new_state, ks_ldap_clear_state): New.
(ks_ldap_free_state): New.
(return_one_keyblock): New. Mostly factored out from ....
(ks_ldap_get): here. Implement --first/--next feature.
* dirmngr/ks-action.c (ks_action_get): Rename arg ldap_only to
ks_get_flags.
* dirmngr/ks-engine.h (KS_GET_FLAG_ONLY_LDAP): New.
(KS_GET_FLAG_FIRST): New.
(KS_GET_FLAG_NEXT): New.
* dirmngr/dirmngr.h (struct server_control_s): Add member
ks_get_state.
(struct ks_engine_ldap_local_s): New forward reference.
--
This feature allows to fetch keyblock by keyblock from an LDAP server.
This way tools can process and maybe filter each keyblock in a more
flexible way. Here is an example where two keyblocks for one mail
address are returned:
$ gpg-connect-agent --dirmngr
> ks_get --ldap --first <[email protected]>
[... First keyblock is returned ]
OK
> ks_get --next
[ ... Next keyblock is returned ]
OK
> ks_get --next
ERR 167772218 No data <Dirmngr>
GnuPG_bug_id: 6224
Diffstat (limited to 'dirmngr/ks-action.c')
| -rw-r--r-- | dirmngr/ks-action.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c index c5374a996..7de4a3b95 100644 --- a/dirmngr/ks-action.c +++ b/dirmngr/ks-action.c @@ -243,7 +243,7 @@ ks_action_search (ctrl_t ctrl, uri_item_t keyservers, keyservers and write the result to the provided output stream. */ gpg_error_t ks_action_get (ctrl_t ctrl, uri_item_t keyservers, - strlist_t patterns, int ldap_only, estream_t outfp) + strlist_t patterns, unsigned int ks_get_flags, estream_t outfp) { gpg_error_t err = 0; gpg_error_t first_err = 0; @@ -270,7 +270,7 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers, || strcmp (uri->parsed_uri->scheme, "https") == 0); int is_ldap = 0; - if (ldap_only) + if ((ks_get_flags & KS_GET_FLAG_ONLY_LDAP)) is_hkp_s = is_http_s = 0; #if USE_LDAP @@ -287,7 +287,8 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers, { #if USE_LDAP if (is_ldap) - err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, &infp); + err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, ks_get_flags, + &infp); else #endif if (is_hkp_s) |