SPF: fix handling mix of spf and other txt records. Bug 2499

[exim.git] / test / stdout / 4200

diff --git a/test/stdout/4200 b/test/stdout/4200
index 02bc22dce5bca600743707e5cc31116d550d6ab2..ac02d8f223076705b370026788f9cb14de3d51cc 100644 (file)
--- a/test/stdout/4200
+++ b/test/stdout/4200
@@ -27,9 +27,9 @@
 > conversion: bogus.xn--ghb.com
 > golden:     bogus.xn--ghb.com
 > 
-> original:   arabic.ليهمابتكلموشعربي؟.com
-> conversion: arabic.xn--egbpdaj6bu4bxfgehfvwxn.com
-> golden:     arabic.xn--egbpdaj6bu4bxfgehfvwxn.com
+> original:   arabic.ليهمابتكلموشعربي.com
+> conversion: arabic.xn--mgbcah9ar9a4efegftvvn.com
+> golden:     arabic.xn--mgbcah9ar9a4efegftvvn.com
 > 
 > original    simpl.chinese.他们为什么不说中文.com
 > conversion: simpl.chinese.xn--ihqwcrb4cv8a8dqg056pqjye.com
@@ -74,16 +74,16 @@
 > golden:     vietnamese.xn--TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g.com
 > 
 > original    straße.de
-> conversion  strasse.de
+> conversion  xn--strae-oqa.de
 > golden:     xn--strae-oqa.de
 > 
 > a-label domain to utf-8:
 > 
 > conversion: arab.ل.com
-> conversion: arab.ليهمابتكلموشعربي؟.com
+> conversion: arab.ليهمابتكلموشعربي.com
 > conversion: simpl.chinese.他们为什么不说中文.com
 > conversion: trad.chinese.他們爲什麽不說中文.com
-> conversion: czech.Pročprostěnemluvíčesky.com
+> conversion: czech.pročprostěnemluvíčesky.com
 > conversion: hebrew.למההםפשוטלאמדבריםעברית.com
 > conversion: hindi.यहलोगहिन्दीक्योंनहींबोलसकतेहैं.com
 > conversion: japanese.なぜみんな日本語を話してくれないのか.com
@@ -91,20 +91,20 @@
 > conversion: russian.почемужеонинеговорятпорусски.com
 > conversion: spanish.PorquénopuedensimplementehablarenEspañol.com
 > conversion: vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.com
-> conversion: german.xn--strae-oqa.de
+> conversion: german.straße.de
 > 
 > ===========
 > 
 > imapfolder conversions:
 > 
 > Foo.Bar
-> Foo.Bar
+> .  Foo.Bar
 > 
 > Foo&AC8-Bar
-> Foo&AC8-Bar
+> .  Foo&AC8-Bar
 > 
 > R&AOQ-ksm&APY-rg&AOU-s
-> R&AOQ-ksm&APY-rg&AOU-s
+> .  R&AOQ-ksm&APY-rg&AOU-s
 > 
 > 
 >