security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

dirmngr: Strip root zone suffix from libdns cname results.

Browse Source 
* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
(get_dns_cname_libdns): Ditto.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-01-02 10:00:33 +01:00
parent 337690441f
commit b200e636ab
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dirmngr/dns-stuff.c
View File

@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short port,
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
goto leave; goto leave;
} }
/* Libdns appends the root zone part which is problematic
* for most other functions - strip it. */
if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.')
(*r_canonname)[strlen (*r_canonname)-1] = 0;
} }
dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1); dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1);
@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname)
*r_cname = xtrystrdup (cname.host); *r_cname = xtrystrdup (cname.host);
if (!*r_cname) if (!*r_cname)
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
else
{
/* Libdns appends the root zone part which is problematic
* for most other functions - strip it. */
if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.')
(*r_cname)[strlen (*r_cname)-1] = 0;
}
leave: leave:
dns_free (ans); dns_free (ans);