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/stdout/0314 | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'test/stdout/0314') diff --git a/test/stdout/0314 b/test/stdout/0314 index b6b0ef461..f486d8f65 100644 --- a/test/stdout/0314 +++ b/test/stdout/0314 @@ -1,13 +1,12 @@ - -**** SMTP testing session as if from host V4NET.0.0.1 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - -554 SMTP service not available - -**** SMTP testing session as if from host V4NET.0.0.2 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - -220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -421 the.local.host.name lost input connection +Connecting to 127.0.0.1 port 1225 ... connected +??? 554 +<<< 554 SMTP service not available +End of script +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +??? 220 +<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 554 +<<< 554 SMTP service not available +End of script -- cgit v1.2.3