From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 25 Nov 2016 11:23:26 +0100 Subject: Merge from master into 4.next Done with git merge --squash -x theirs master --- test/stderr/0364 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/stderr/0364') diff --git a/test/stderr/0364 b/test/stderr/0364 index f648839f1..d6a49bbf6 100644 --- a/test/stderr/0364 +++ b/test/stderr/0364 @@ -81,7 +81,7 @@ r2 router declined for solik@otherhost.test.ex --------> r3 router <-------- local_part=solik domain=otherhost.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): $local_part@$original_domain.sub.test.ex @@ -107,7 +107,7 @@ r2 router declined for solik@otherhost.sub.test.ex --------> r3 router <-------- local_part=solik domain=otherhost.sub.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... r3 router skipped: condition failure --------> r4 router <-------- local_part=solik domain=otherhost.sub.test.ex @@ -184,7 +184,7 @@ r2 router declined for xxx@testsub.test.ex --------> r3 router <-------- local_part=xxx domain=testsub.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): $local_part@$original_domain.sub.test.ex -- cgit v1.2.3