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 /nss | |
| parent | d5dd6189d506068ed11c8bfa1e1e9bffde04decd (diff) | |
| download | glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.tar glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.tar.gz glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.tar.bz2 glibc-3d04f5db20c8f0d1ba3881b5f5373586a18cf188.zip | |
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 'nss')
| -rw-r--r-- | nss/getXXbyYY_r.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 44d00f4bcf..33e63d4318 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -287,10 +287,10 @@ done: #endif *result = status == NSS_STATUS_SUCCESS ? resbuf : NULL; #ifdef NEED_H_ERRNO - if (status == NSS_STATUS_UNAVAIL) - /* Either we failed to lookup the functions or the functions themselves - had a system error. Set NETDB_INTERNAL here to let the caller know - that the errno may have the real reason for failure. */ + if (status == NSS_STATUS_UNAVAIL && !any_service && errno != ENOENT) + /* This happens when we weren't able to use a service for reasons other + than the module not being found. In such a case, we'd want to tell the + caller that errno has the real reason for failure. */ *h_errnop = NETDB_INTERNAL; else if (status != NSS_STATUS_SUCCESS && !any_service) /* We were not able to use any service. */ |