diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-09-01 08:57:52 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-09-01 08:57:52 +0200 |
| commit | a2881ef01450295782b065f2f850f340d5c12c14 (patch) | |
| tree | 7abcbf2374defb0b0d3c7b0ad5613b99d2406cf4 | |
| parent | ad816a5e00ce891a2cea8187638fa0e00f83aaf6 (diff) | |
| download | glibc-a2881ef01450295782b065f2f850f340d5c12c14.tar.gz glibc-a2881ef01450295782b065f2f850f340d5c12c14.tar.xz glibc-a2881ef01450295782b065f2f850f340d5c12c14.zip | |
getaddrinfo: In gaih_inet, use h_errno for certain status values only
h_errno is not set for NSS_STATUS_SUCCESS, so its value might not be accurate at this point.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4229a83b9c..f86a435448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-09-01 Florian Weimer <fweimer@redhat.com> + * sysdeps/posix/getaddrinfo.c (gaih_inet): Only use h_errno if + status indicates it is set. + +2017-09-01 Florian Weimer <fweimer@redhat.com> + * sysdeps/posix/getaddrinfo.c (gaih_inet): Make reporting of NSS function lookup failures more reliable. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 95b514873d..acb5d9e73d 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -948,7 +948,10 @@ gaih_inet (const char *name, const struct gaih_service *service, __resolv_context_enable_inet6 (res_ctx, res_enable_inet6); __resolv_context_put (res_ctx); - if (h_errno == NETDB_INTERNAL) + /* If we have a failure which sets errno, report it using + EAI_SYSTEM. */ + if ((status == NSS_STATUS_TRYAGAIN || status == NSS_STATUS_UNAVAIL) + && h_errno == NETDB_INTERNAL) { result = -EAI_SYSTEM; goto free_and_return; |