security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

dirmngr: Fix for --disable-libdns usage.

Browse Source 
* dirmngr/dns-stuff.c (enable_recursive_resolver, set_dns_nameserver)
(reload_dns_stuff): Conditionalize with USE_LIBDNS.
(get_h_errno_as_gpg_error): Map HOST_NOT_FOUND to GPG_ERR_NO_NAME.

--

get_dns_srv assumes error code of GPG_ERR_NO_NAME when no SRV record
available.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
GnuPG-bug-id: 2889
This commit is contained in:
NIIBE Yutaka 2016-12-23 16:05:01 +09:00
parent 1909e994cb
commit d26c51825e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dirmngr/dns-stuff.c
View File

@ -181,7 +181,9 @@ void
enable_recursive_resolver (int yes) enable_recursive_resolver (int yes)
{ {
recursive_resolver = yes; recursive_resolver = yes;
#ifdef USE_LIBDNS
libdns_reinit_pending = 1; libdns_reinit_pending = 1;
#endif
} }
@ -251,8 +253,10 @@ set_dns_nameserver (const char *ipaddr)
strncpy (tor_nameserver, ipaddr? ipaddr : DEFAULT_NAMESERVER, strncpy (tor_nameserver, ipaddr? ipaddr : DEFAULT_NAMESERVER,
sizeof tor_nameserver -1); sizeof tor_nameserver -1);
tor_nameserver[sizeof tor_nameserver -1] = 0; tor_nameserver[sizeof tor_nameserver -1] = 0;
#ifdef USE_LIBDNS
libdns_reinit_pending = 1; libdns_reinit_pending = 1;
libdns_tor_port = 0; /* Start again with the default port. */ libdns_tor_port = 0; /* Start again with the default port. */
#endif
} }
@ -278,7 +282,7 @@ get_h_errno_as_gpg_error (void)
switch (h_errno) switch (h_errno)
{ {
case HOST_NOT_FOUND: ec = GPG_ERR_UNKNOWN_HOST; break; case HOST_NOT_FOUND: ec = GPG_ERR_NO_NAME; break;
case TRY_AGAIN: ec = GPG_ERR_TRY_LATER; break; case TRY_AGAIN: ec = GPG_ERR_TRY_LATER; break;
case NO_RECOVERY: ec = GPG_ERR_SERVER_FAILED; break; case NO_RECOVERY: ec = GPG_ERR_SERVER_FAILED; break;
case NO_DATA: ec = GPG_ERR_NO_DATA; break; case NO_DATA: ec = GPG_ERR_NO_DATA; break;
@ -534,15 +538,17 @@ libdns_deinit (void)
void void
reload_dns_stuff (int force) reload_dns_stuff (int force)
{ {
#ifdef USE_LIBDNS
if (force) if (force)
{ {
#ifdef USE_LIBDNS
libdns_deinit (); libdns_deinit ();
#endif
libdns_reinit_pending = 0; libdns_reinit_pending = 0;
} }
else else
libdns_reinit_pending = 1; libdns_reinit_pending = 1;
#else
(void)force;
#endif
} }