security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-19 09:02:22 +02:00
Code Activity

libdns: Workaround for bracketed numerical addresses.

Browse Source 
* dirmngr/dns-stuff.c (resolve_name_libdns): Work around an
incompatibility between the glibc resolver and libdns.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-02-15 19:17:08 +01:00
parent a75325faf1
commit a3509e12b6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dirmngr/dns-stuff.c
View File

@ -719,6 +719,7 @@ resolve_name_libdns (const char *name, unsigned short port,
struct addrinfo *ent; struct addrinfo *ent;
char portstr_[21]; char portstr_[21];
char *portstr = NULL; char *portstr = NULL;
char *namebuf = NULL;
int derr; int derr;
*r_dai = NULL; *r_dai = NULL;
@ -731,8 +732,6 @@ resolve_name_libdns (const char *name, unsigned short port,
hints.ai_flags = AI_ADDRCONFIG; hints.ai_flags = AI_ADDRCONFIG;
if (r_canonname) if (r_canonname)
hints.ai_flags |= AI_CANONNAME; hints.ai_flags |= AI_CANONNAME;
if (is_ip_address (name))
hints.ai_flags |= AI_NUMERICHOST;
if (port) if (port)
{ {
@ -744,6 +743,25 @@ resolve_name_libdns (const char *name, unsigned short port,
if (err) if (err)
goto leave; goto leave;
if (is_ip_address (name))
{
hints.ai_flags |= AI_NUMERICHOST;
/* libdns does not grok brackets - remove them. */
if (*name == '[' && name[strlen(name)-1] == ']')
{
namebuf = xtrymalloc (strlen (name));
if (!namebuf)
{
err = gpg_error_from_syserror ();
goto leave;
}
strcpy (namebuf, name+1);
namebuf[strlen (namebuf)-1] = 0;
name = namebuf;
}
}
ai = dns_ai_open (name, portstr, 0, &hints, res, &derr); ai = dns_ai_open (name, portstr, 0, &hints, res, &derr);
if (!ai) if (!ai)
{ {
@ -825,6 +843,7 @@ resolve_name_libdns (const char *name, unsigned short port,
else else
*r_dai = daihead; *r_dai = daihead;
xfree (namebuf);
return err; return err;
} }
#endif /*USE_LIBDNS*/ #endif /*USE_LIBDNS*/
@ -1208,7 +1227,7 @@ is_ip_address (const char *name)
if (*name == '[') if (*name == '[')
return 6; /* yes: A legal DNS name may not contain this character; return 6; /* yes: A legal DNS name may not contain this character;
this mut be bracketed v6 address. */ this must be bracketed v6 address. */
if (*name == '.') if (*name == '.')
return 0; /* No. A leading dot is not a valid IP address. */ return 0; /* No. A leading dot is not a valid IP address. */