From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 16 Oct 2006 15:20:20 +0000 (+0000)
Subject: [BZ #3369]
X-Git-Tag: cvs/fedora-glibc-20061025T1857~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a85a8ee31c357ce499529ca76136cce0b6773e9;p=thirdparty%2Fglibc.git

[BZ #3369]

2006-10-16  Ulrich Drepper  <drepper@redhat.com>
	[BZ #3369]
	* sysdeps/posix/getaddrinfo.c (rfc3484_sort): Fix typos in rules 4
	and 7.
---

diff --git a/ChangeLog b/ChangeLog
index d2cf5fc51d5..3c9628c131b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-16  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #3369]
+	* sysdeps/posix/getaddrinfo.c (rfc3484_sort): Fix typos in rules 4
+	and 7.
+
 2006-10-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated.
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 9387e20db24..84a6293365b 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/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?  */
     }