Attempt egrep compat for Solaris vs. Linux

[exim.git] / test / stdout / 2114

diff --git a/test/stdout/2114 b/test/stdout/2114
index 401784f3ace5b9e6a44229490995bf129c34e729..f37ca8cab00ec3faaf615387c5bd950cc2426834 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -53,7 +53,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250
 Succeeded in starting TLS
 >>> helo rhu.barb
 ??? 250


@@ -91,8 +90,10 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -126,8 +127,10 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -192,8 +195,10 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -258,8 +263,10 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -293,8 +300,10 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK