mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Fix mailbox based search via AKL keyserver method.
* g10/keyserver.c (keyserver_import_name): Rename to ... (keyserver_import_mbox): this. And use mail search mode. * g10/getkey.c (get_pubkey_byname): Change the two callers. -- In contrast to a search via keyserver_import_ntds the older keyserver_import_name used a full match of the provided name despite that it is only called with an addr-spec (mbox). Due to the mode the pattern send to dirmngr was prefixed with a '=' and thus dirmngr used an exact search;. This did only work for provided user ids like "foo@example.org" but not for "<foo@example.org>" or "Foo <foo@xample.org>". The old code dates back to 2010. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
99db4b0c7f
commit
4fcfac6feb
5 changed files with 11 additions and 13 deletions
|
@ -1122,18 +1122,16 @@ keyserver_any_configured (ctrl_t ctrl)
|
|||
}
|
||||
|
||||
|
||||
/* Import all keys that exactly match NAME */
|
||||
/* Import all keys that exactly match MBOX */
|
||||
int
|
||||
keyserver_import_name (ctrl_t ctrl, const char *name,
|
||||
keyserver_import_mbox (ctrl_t ctrl, const char *mbox,
|
||||
unsigned char **fpr, size_t *fprlen,
|
||||
struct keyserver_spec *keyserver)
|
||||
{
|
||||
KEYDB_SEARCH_DESC desc;
|
||||
KEYDB_SEARCH_DESC desc = { 0 };
|
||||
|
||||
memset (&desc, 0, sizeof desc);
|
||||
|
||||
desc.mode = KEYDB_SEARCH_MODE_EXACT;
|
||||
desc.u.name = name;
|
||||
desc.mode = KEYDB_SEARCH_MODE_MAIL;
|
||||
desc.u.name = mbox;
|
||||
|
||||
return keyserver_get (ctrl, &desc, 1, keyserver, 0, fpr, fprlen);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue