summaryrefslogtreecommitdiff
path: root/libc/sysdeps/posix
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-10-18 15:30:11 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-10-18 15:30:11 +0000
commit0048423cf450ec8a7ab725bc43a0f4a0372c1737 (patch)
tree6992e095eb10e356ba84c291523174a264e87407 /libc/sysdeps/posix
parentb0c556f461de6418fb565a208c1b290026b4f355 (diff)
downloadeglibc2-0048423cf450ec8a7ab725bc43a0f4a0372c1737.tar.gz
Merge changes between r345 and r426 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@427 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/posix')
-rw-r--r--libc/sysdeps/posix/getaddrinfo.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/sysdeps/posix/getaddrinfo.c b/libc/sysdeps/posix/getaddrinfo.c
index 9387e20db..84a629336 100644
--- a/libc/sysdeps/posix/getaddrinfo.c
+++ b/libc/sysdeps/posix/getaddrinfo.c
@@ -1395,10 +1395,10 @@ rfc3484_sort (const void *p1, const void *p2)
{
if (!(a1->source_addr_flags & in6ai_homeaddress)
&& (a2->source_addr_flags & in6ai_homeaddress))
- return -1;
+ return 1;
if ((a1->source_addr_flags & in6ai_homeaddress)
&& !(a2->source_addr_flags & in6ai_homeaddress))
- return 1;
+ return -1;
}
/* Rule 5: Prefer matching label. */
@@ -1435,11 +1435,11 @@ rfc3484_sort (const void *p1, const void *p2)
if (a1->got_source_addr)
{
if (!(a1->source_addr_flags & in6ai_temporary)
- && (a1->source_addr_flags & in6ai_temporary))
+ && (a2->source_addr_flags & in6ai_temporary))
return -1;
if ((a1->source_addr_flags & in6ai_temporary)
- && !(a1->source_addr_flags & in6ai_temporary))
- return -1;
+ && !(a2->source_addr_flags & in6ai_temporary))
+ return 1;
/* XXX Do we need to check anything beside temporary addresses? */
}