mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-18 14:17:03 +01:00
dirmngr: Map all gnupg.net addresses to the Ubuntu keyserver.
* dirmngr/server.c (make_keyserver_item): Change mapping. -- It turned out that having the old surfnet keyserver for unencrypted connections is problematic because that server does not sync with the Ubuntu server. GnuPG-bug-id: 5751
This commit is contained in:
parent
99a8b1f138
commit
d445e19365
@ -2142,18 +2142,18 @@ make_keyserver_item (const char *uri, uri_item_t *r_item)
|
||||
else if (!strcmp (uri, "https://keys.gnupg.net"))
|
||||
uri = "hkps://keyserver.ubuntu.com";
|
||||
else if (!strcmp (uri, "hkp://keys.gnupg.net"))
|
||||
uri = "hkp://pgp.surf.nl";
|
||||
uri = "hkp://keyserver.ubuntu.com";
|
||||
else if (!strcmp (uri, "http://keys.gnupg.net"))
|
||||
uri = "hkp://pgp.surf.nl:80";
|
||||
uri = "hkp://keyserver.ubuntu.com:80";
|
||||
else if (!strcmp (uri, "hkps://http-keys.gnupg.net")
|
||||
|| !strcmp (uri, "http-keys.gnupg.net"))
|
||||
uri = "hkps://keyserver.ubuntu.com";
|
||||
else if (!strcmp (uri, "https://http-keys.gnupg.net"))
|
||||
uri = "hkps://keyserver.ubuntu.com";
|
||||
else if (!strcmp (uri, "hkp://http-keys.gnupg.net"))
|
||||
uri = "hkp://pgp.surf.nl";
|
||||
uri = "hkp://keyserver.ubuntu.com";
|
||||
else if (!strcmp (uri, "http://http-keys.gnupg.net"))
|
||||
uri = "hkp://pgp.surf.nl:80";
|
||||
uri = "hkp://keyserver.ubuntu.com:80";
|
||||
|
||||
item = xtrymalloc (sizeof *item + strlen (uri));
|
||||
if (!item)
|
||||
|
Loading…
x
Reference in New Issue
Block a user