summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-14 22:35:02 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-14 22:35:02 +0000
commitdfcf64cedb4c9baf1657e2bade801b71e6c9a6a2 (patch)
treed2c0b75b2973752b725626651fec27546ddab836
parenta94673e616869418694e8549e01d7c952f828c99 (diff)
* posix/tst-rfc3484-2.c (do_test): Likewise.
-rw-r--r--ChangeLog1
-rw-r--r--posix/tst-rfc3484-2.c4
-rw-r--r--posix/tst-rfc3484.c1
3 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8365679d4f..71351283ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
(getaddrinfo): Initialize service_order.
* posix/tst-rfc3484.c (do_test): Adjust for addition of
service_order field to sorting structure.
+ * posix/tst-rfc3484-2.c (do_test): Likewise.
* include/time.h: Declare __tzset_parse_tz and __tzset_compute.
* time/tzset.c (tzset_internal): Break TZ string parsing out into
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index ae802c0652..f318523ed5 100644
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -98,12 +98,14 @@ do_test (void)
results[0].got_source_addr = true;
results[0].source_addr_len = sizeof (so1);
results[0].source_addr_flags = 0;
+ results[0].service_order = 0;
memcpy (&results[0].source_addr, &so1, sizeof (so1));
results[1].dest_addr = &ai2;
results[1].got_source_addr = true;
results[1].source_addr_len = sizeof (so2);
results[1].source_addr_flags = 0;
+ results[1].service_order = 1;
memcpy (&results[1].source_addr, &so2, sizeof (so2));
@@ -122,12 +124,14 @@ do_test (void)
results[1].got_source_addr = true;
results[1].source_addr_len = sizeof (so1);
results[1].source_addr_flags = 0;
+ results[1].service_order = 1;
memcpy (&results[1].source_addr, &so1, sizeof (so1));
results[0].dest_addr = &ai2;
results[0].got_source_addr = true;
results[0].source_addr_len = sizeof (so2);
results[0].source_addr_flags = 0;
+ results[0].service_order = 0;
memcpy (&results[0].source_addr, &so2, sizeof (so2));
diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index 352a7579ac..08d57a66ee 100644
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -93,6 +93,7 @@ do_test (void)
memcpy(&results[i].source_addr, &so, sizeof (so));
results[i].source_addr_len = sizeof (so);
results[i].source_addr_flags = 0;
+ results[i].service_order = i;
}
qsort (results, naddrs, sizeof (results[0]), rfc3484_sort);