diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2013-05-21 21:54:41 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2013-05-21 21:54:41 +0530 |
| commit | 3d04f5db20c8f0d1ba3881b5f5373586a18cf188 (patch) | |
| tree | 9f49a788186914f0061f340e938ad21d293f7762 /sysdeps/posix | |
| parent | d5dd6189d506068ed11c8bfa1e1e9bffde04decd (diff) | |
| download | glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.zip glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.tar.gz glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.tar.bz2 | |
Set EAI_SYSTEM only when h_errno is NETDB_INTERNAL
Fixes BZ #15339.
NSS_STATUS_UNAVAIL may mean that a necessary input resource is not
available. This could occur in a number of cases including when the
network is down, system runs out of file descriptors, etc. The
correct differentiator in such a case is the h_errno, which gives the
nature of failure. In case of failures other than a simple 'not
found', we set h_errno as NETDB_INTERNAL and let errno be the
identifier for the exact error.
Diffstat (limited to 'sysdeps/posix')
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index ab135ad..7bb3ded 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -1036,7 +1036,15 @@ gaih_inet (const char *name, const struct gaih_service *service, } } else - status = NSS_STATUS_UNAVAIL; + { + status = NSS_STATUS_UNAVAIL; + /* Could not load any of the lookup functions. Indicate + an internal error if the failure was due to a system + error other than the file not being found. We use the + errno from the last failed callback. */ + if (errno != 0 && errno != ENOENT) + __set_h_errno (NETDB_INTERNAL); + } } if (nss_next_action (nip, status) == NSS_ACTION_RETURN) @@ -1050,7 +1058,7 @@ gaih_inet (const char *name, const struct gaih_service *service, _res.options |= old_res_options & RES_USE_INET6; - if (status == NSS_STATUS_UNAVAIL) + if (h_errno == NETDB_INTERNAL) { result = GAIH_OKIFUNSPEC | -EAI_SYSTEM; goto free_and_return; |