Commit 124bdcc1 authored by Dan Jacobowitz's avatar Dan Jacobowitz

- debian/patches/glibc23-getaddrinfo.dpatch: Add getaddrinfo patch

      from CVS (Closes: #174027).
    - debian/control.in/main: Add myself to Uploaders.

svn path=/trunk/; revision=146
parent 2c2f2c69
glibc (2.3.1-8) unstable; urgency=high
* Daniel Jacobowitz <dan@debian.org>
- Temporarily re-enable linking to "errno" to fix compatibility with
broken binaries (Closes: #174040, #174004).
-- Daniel Jacobowitz <dan@debian.org> Tue, 24 Dec 2002 11:04:32 -0500
- debian/patches/glibc23-errno.dpatch: Temporarily re-enable linking
to "errno" to fix compatibility with broken binaries
(Closes: #174040, #174004).
- debian/patches/glibc23-getaddrinfo.dpatch: Add getaddrinfo patch
from CVS (Closes: #174027).
- debian/control.in/main: Add myself to Uploaders.
-- Daniel Jacobowitz <dan@debian.org> Tue, 24 Dec 2002 12:35:39 -0500
glibc (2.3.1-7) unstable; urgency=high
......
......@@ -5,7 +5,7 @@ Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5),
Build-Depends-Indep: perl, latex2html
Build-Conflicts: kernel-headers-2.4.19-sparc [!sparc], kernel-headers-2.4.18-sparc [!sparc]
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.or.jp>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@nisa.net>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.or.jp>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@nisa.net>, Daniel Jacobowitz <dan@debian.org>
Standards-Version: 3.5.7.0
Package: @glibc@-doc
......
......@@ -40,3 +40,4 @@ glibc23-hppa-Rminkernel
glibc23-function-compat
glibc23-getdents64-fix
glibc23-errno
glibc23-getaddrinfo
#! /bin/sh -e
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Fix segfault in getaddrinfo
# DP: Author: Ulrich Drepper <drepper@redhat.com>
# DP: Upstream status: In CVS
# DP: Date: December 24, 2002
if [ $# -ne 2 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
# append the patch here and adjust the -p? flag in the patch calls.
2002-12-16 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): If __nss_lookup_function
fails to return a function pointer don't use it.
--- glibc-2.3.1.orig/sysdeps/posix/getaddrinfo.c 2002-12-23 10:47:34.000000000 -0500
+++ glibc-2.3.1/sysdeps/posix/getaddrinfo.c 2002-12-24 10:08:27.000000000 -0500
@@ -570,25 +570,28 @@ gaih_inet (const char *name, const struc
{
fct = __nss_lookup_function (nip, "gethostbyname2_r");
- gethosts2 (AF_INET6, struct in6_addr);
- no_inet6_data = no_data;
- inet6_status = status;
- gethosts2 (AF_INET, struct in_addr);
-
- /* If we found one address for AF_INET or AF_INET6,
- don't continue the search. */
- if (inet6_status == NSS_STATUS_SUCCESS ||
- status == NSS_STATUS_SUCCESS)
- break;
-
- /* We can have different states for AF_INET
- and AF_INET6. Try to find a usefull one for
- both. */
- if (inet6_status == NSS_STATUS_TRYAGAIN)
- status = NSS_STATUS_TRYAGAIN;
- else if (status == NSS_STATUS_UNAVAIL &&
- inet6_status != NSS_STATUS_UNAVAIL)
- status = inet6_status;
+ if (fct != NULL)
+ {
+ gethosts2 (AF_INET6, struct in6_addr);
+ no_inet6_data = no_data;
+ inet6_status = status;
+ gethosts2 (AF_INET, struct in_addr);
+
+ /* If we found one address for AF_INET or AF_INET6,
+ don't continue the search. */
+ if (inet6_status == NSS_STATUS_SUCCESS ||
+ status == NSS_STATUS_SUCCESS)
+ break;
+
+ /* We can have different states for AF_INET
+ and AF_INET6. Try to find a usefull one for
+ both. */
+ if (inet6_status == NSS_STATUS_TRYAGAIN)
+ status = NSS_STATUS_TRYAGAIN;
+ else if (status == NSS_STATUS_UNAVAIL &&
+ inet6_status != NSS_STATUS_UNAVAIL)
+ status = inet6_status;
+ }
if (nss_next_action (nip, status) == NSS_ACTION_RETURN)
break;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment