security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-20 01:02:44 +02:00
Code Activity

dirmngr: ADNS error handling fix.

Browse Source 
* dirmngr/dns-stuff.c (resolve_name_adns, get_dns_cert, get_dns_cname):
Use gpg_error and gpg_err_code_from_errno to compose the error value.

--
This fixes commits 6f1d8123d6.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-10-27 16:22:26 +09:00
parent a15ed5a1fd
commit 45dfc02b47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dirmngr/dns-stuff.c
View File

@ -278,7 +278,7 @@ resolve_name_adns (const char *name, unsigned short port,
my_protect (); my_protect ();
if (ret) if (ret)
{ {
err = ret; err = gpg_error (gpg_err_code_from_errno (ret));
log_error ("DNS query failed: %s\n", gpg_strerror (err)); log_error ("DNS query failed: %s\n", gpg_strerror (err));
goto leave; goto leave;
} }
@ -682,8 +682,8 @@ get_dns_cert (const char *name, int want_certtype,
my_protect (); my_protect ();
if (ret) if (ret)
{ {
err = ret; err = gpg_error (gpg_err_code_from_errno (ret));
/* log_error ("DNS query failed: %s\n", strerror (err)); */ /* log_error ("DNS query failed: %s\n", gpg_strerror (err)); */
adns_finish (state); adns_finish (state);
return err; return err;
} }
@ -1281,7 +1281,7 @@ get_dns_cname (const char *name, char **r_cname)
my_protect (); my_protect ();
if (rc) if (rc)
{ {
err = rc; err = gpg_error (gpg_err_code_from_errno (rc));
log_error ("DNS query failed: %s\n", gpg_strerror (err)); log_error ("DNS query failed: %s\n", gpg_strerror (err));
adns_finish (state); adns_finish (state);
return err; return err;