From 068ebb6f1eee37d31f5ffb44b7f8069d9ca3f7b8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 4 Jun 2024 18:02:02 +0200 Subject: gpg: Implement the LDAP AKL method. * g10/keyserver.c (keyserver_import_mbox): Add arg flags and change callers. (keyserver_import_ldap): Remove. It has always returned a not implemented error since 2.1. * g10/getkey.c (get_pubkey_byname): Repurpose LDAP to do basically the same as KEYSERVER. -- The old LDAP mechanism to locate a server via SRV records has long been gone (since 2014) due to the dropping of the keyserver helpers. The new purpose better reflects reality and can be used in environments where keys are provided by an in-house LDAP server. --- g10/keyserver-internal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'g10/keyserver-internal.h') diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index 5c27c3a2b..cb2c005b4 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -55,10 +55,9 @@ gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned char **fpr, size_t *fpr_len); int keyserver_import_ntds (ctrl_t ctrl, const char *name, unsigned char **fpr,size_t *fpr_len); -int keyserver_import_mbox (ctrl_t ctrl, const char *mbox, - unsigned char **fpr,size_t *fpr_len, - struct keyserver_spec *keyserver); -int keyserver_import_ldap (ctrl_t ctrl, const char *name, - unsigned char **fpr,size_t *fpr_len); +gpg_error_t keyserver_import_mbox (ctrl_t ctrl, const char *mbox, + unsigned char **fpr,size_t *fpr_len, + struct keyserver_spec *keyserver, + unsigned int flags); #endif /* !_KEYSERVER_INTERNAL_H_ */ -- cgit v1.2.3