← Back to branch summary

~ubuntu-toolchain/glibc/eglibc-2.9-pkg

« back to all changes in this revision

Viewing changes to patches/any/cvs-getaddrinfo-nss-notfound.diff

  • Committer: Matthias Klose
  • Date: 2009-07-29 14:20:09 UTC
  • Revision ID: doko@canonical.com-20090729142009-x92lgcdwdvz8vf6x
* Merge with Debian (r3713, trunk).

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/any/cvs-getaddrinfo-nss-notfound.diff
 
1
 2009-07-25  Ulrich Drepper  <drepper@redhat.com>
 
2
 
 
3
        [BZ #10448]
 
4
        * sysdeps/posix/getaddrinfo.c (gaih_inet): If NSS module contains no
 
5
        callback we must touch the status to avoid using stale value.
 
6
 
 
7
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
 
8
index d346c62..a788d18 100644
 
9
--- a/sysdeps/posix/getaddrinfo.c
 
10
+++ b/sysdeps/posix/getaddrinfo.c
 
11
@@ -833,6 +833,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
 
12
                               && inet6_status != NSS_STATUS_UNAVAIL)
 
13
                        status = inet6_status;
 
14
                    }
 
15
+                 else
 
16
+                   status = NSS_STATUS_UNAVAIL;
 
17
                }
 
18
 
 
19
              if (nss_next_action (nip, status) == NSS_ACTION_RETURN)