From 4de98d4468f37bfb8352426830d5d5642ded7536 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 4 Oct 2022 12:44:29 +0200 Subject: 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 [... First keyblock is returned ] OK > ks_get --next [ ... Next keyblock is returned ] OK > ks_get --next ERR 167772218 No data GnuPG_bug_id: 6224 --- dirmngr/dirmngr.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dirmngr/dirmngr.h') diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index 9f2157c0d..e7591b998 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -187,8 +187,10 @@ struct cert_ref_s }; typedef struct cert_ref_s *cert_ref_t; +/* Forward reference; access only via ks-engine-ldap.c. */ +struct ks_engine_ldap_local_s; -/* Forward references; access only through server.c. */ +/* Forward reference; access only through server.c. */ struct server_local_s; #if SIZEOF_UNSIGNED_LONG == 8 @@ -205,6 +207,7 @@ struct server_control_s int no_server; /* We are not running under server control. */ int status_fd; /* Only for non-server mode. */ struct server_local_s *server_local; + struct ks_engine_ldap_local_s *ks_get_state; int force_crl_refresh; /* Always load a fresh CRL. */ int check_revocations_nest_level; /* Internal to check_revovations. */ -- cgit v1.2.3