From 0fe36dd93023f1be9518df12c775a920dea60e1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Sep 2017 09:39:14 +0200 Subject: [PATCH] test-dns-domain: allow old and new libidn2 behaviour (#6749) The behaviour changed to allow underscores. For now, lets just accept both return values. Fixes #6573. --- src/test/test-dns-domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index cbd2d1e..93b758e 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -615,7 +615,10 @@ static void test_dns_name_apply_idna_one(const char *s, int expected, const char log_debug("dns_name_apply_idna: \"%s\" → %d/\"%s\" (expected %d/\"%s\")", s, r, strnull(buf), expected, strnull(result)); - assert_se(r == expected); + /* Different libidn2 versions are more and less accepting + * of underscore-prefixed names. So let's list the lowest + * expected return value. */ + assert_se(r >= expected); if (expected == 1) assert_se(dns_name_equal(buf, result) == 1); } -- 2.7.4