tests: Fixed smtp mail from addresses

diff --git a/tests/data/test1320 b/tests/data/test1320
index 15ec7bb6c2f6b39cf836f9670c15ae71f27e9c70..1caa062b9e43aa33230c7040d692face6948777a 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -35,7 +35,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@from -T - -p -x %HOSTIP:%PROXYPORT
+smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.exa
 </strip>
 <protocol>
 EHLO user\r
-MAIL FROM:<1320@from>\r
+MAIL FROM:<1320@example.com>\r
 RCPT TO:<1320@foo>\r
 RCPT TO:<1320@foobar.example>\r
 DATA\r

diff --git a/tests/data/test1406 b/tests/data/test1406
index 158d30b36bc4347c2ab1bb6dec9db5a294c95bcf..ac98246702766e2ffbf17742338fd0c4f21a3f54 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -32,7 +32,7 @@ To: another
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@from -T log/test1406.eml --libcurl log/test1406.c
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@example.com -T log/test1406.eml --libcurl log/test1406.c
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<1406@from> SIZE=38\r
+MAIL FROM:<1406@example.com> SIZE=38\r
 RCPT TO:<1406@foo>\r
 RCPT TO:<1406@foobar.example>\r
 DATA\r
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
-  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@from");
+  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@example.com");
   curl_easy_setopt(hnd, CURLOPT_MAIL_RCPT, slist1);
 
   /* Here is a list of options the curl code used that cannot get generated

diff --git a/tests/data/test900 b/tests/data/test900
index 749a9657438ac061a49353ca5846de40c5c496ea..25b3f46368cde0f547c83ae50e817324a37d909e 100644 (file)
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@example.com -T -
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<900@from>\r
+MAIL FROM:<900@example.com>\r
 RCPT TO:<900@foo>\r
 RCPT TO:<900@foobar.example>\r
 DATA\r

diff --git a/tests/data/test901 b/tests/data/test901
index ed24518241a3b924af33d9b79981de303889e046..8c512eb4ab9ade2dcb84513d1f79cdbf68beed93 100644 (file)
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -32,7 +32,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from 901@example.com -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<901@from>\r
+MAIL FROM:<901@example.com>\r
 RCPT TO:<901@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test902 b/tests/data/test902
index c61ab93532464d93ee8fb480423f8f9bdc98db52..89b10b5b0e3d5655b6bad1d9df4630a4e73bf54e 100644 (file)
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -31,7 +31,7 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@example.com -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
 <protocol>
 EHLO user\r
 HELO user\r
-MAIL FROM:<902@from>\r
+MAIL FROM:<902@example.com>\r
 RCPT TO:<902@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test903 b/tests/data/test903
index 157bd48cbe566f2716ac5d11d3912cf5daf4b5a7..c41ff3d569a6ef24a5ab78bd6b81db3cf563946c 100644 (file)
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -31,7 +31,7 @@ SMTP plain authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1
 EHLO user\r
 AUTH PLAIN\r
 dGVzdAB0ZXN0ADEyMzQ=\r
-MAIL FROM:<903@from>\r
+MAIL FROM:<903@example.com>\r
 RCPT TO:<903@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test904 b/tests/data/test904
index 1a23f4157c331c84b38550d2f6735dbed1df75be..650181de054793c9bc57bacb3c16bb2bb5ae9399 100644 (file)
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -31,7 +31,7 @@ SMTP login authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -43,7 +43,7 @@ EHLO user
 AUTH LOGIN\r
 dGVzdA==\r
 MTIzNA==\r
-MAIL FROM:<904@from>\r
+MAIL FROM:<904@example.com>\r
 RCPT TO:<904@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test905 b/tests/data/test905
index fccd84baeab1286cca5b37be7e8589234269ad36..0068f599107c235ff2b3b816fb6af020de0830b8 100644 (file)
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@example.com -u tim:tanstaaftanstaaf -T -
 </command>
 </client>
 
@@ -45,7 +45,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:ta
 EHLO user\r
 AUTH CRAM-MD5\r
 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw\r
-MAIL FROM:<905@from>\r
+MAIL FROM:<905@example.com>\r
 RCPT TO:<905@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test907 b/tests/data/test907
index 511d51970ef160b57890cd49c0e5e86e7bac350a..d191a287772d3dbb6892fae906b962750293a9e0 100644 (file)
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1
 <protocol>
 EHLO user\r
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=\r
-MAIL FROM:<907@from>\r
+MAIL FROM:<907@example.com>\r
 RCPT TO:<907@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test908 b/tests/data/test908
index 61d56c5e04dedd5313fc0f764092c40a0b723faf..3f4d4242afc9d17f40bf090ca7252f4d6a5531ff 100644 (file)
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1
 EHLO user\r
 AUTH LOGIN dGVzdA==\r
 MTIzNA==\r
-MAIL FROM:<908@from>\r
+MAIL FROM:<908@example.com>\r
 RCPT TO:<908@foo>\r
 DATA\r
 QUIT\r

diff --git a/tests/data/test909 b/tests/data/test909
index 2fc1f191d97a7d9eb5fdde12ab67a95fa7e4cb62..0122dfe48e58797d393bd8ffbeff362a9368270d 100644 (file)
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -30,7 +30,7 @@ To: another
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example --mail-from 909@from -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example --mail-from 909@example.com -T log/test909.eml
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<909@from>\r
+MAIL FROM:<909@example.com>\r
 RCPT TO:<909@foo>\r
 RCPT TO:<909@foobar.example>\r
 DATA\r

diff --git a/tests/data/test910 b/tests/data/test910
index 5013fdc75f5081693c7e9ce7813d17c77667fa6e..5f8186f663a367a72f93016cacfd5c333e2f8e45 100644 (file)
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@example.com -T -
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<910@from>\r
+MAIL FROM:<910@example.com>\r
 RCPT TO:<910@foo>\r
 RCPT TO:<910@foobar.example>\r
 DATA\r

diff --git a/tests/data/test911 b/tests/data/test911
index 6b7a1f40e8e8dd3ffaec254f763957c23426d80f..c8cecdc9cbecb648ab3a9715e5171bc4256acf77 100644 (file)
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<911@from>\r
+MAIL FROM:<911@example.com>\r
 RCPT TO:<911@foo>\r
 RCPT TO:<911@foobar.example>\r
 DATA\r

diff --git a/tests/data/test912 b/tests/data/test912
index beea8a24679ceddcde2e16286eb004231e679681..7c9d7bbe71e14e79e48026897b4a4d79f20f2140 100644 (file)
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -30,7 +30,7 @@ To: another
 body\r
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@from -T log/test912.eml
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@example.com -T log/test912.eml
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@from -T log/te
 <verify>
 <protocol>
 EHLO user\r
-MAIL FROM:<912@from> SIZE=38\r
+MAIL FROM:<912@example.com> SIZE=38\r
 RCPT TO:<912@foo>\r
 DATA\r
 QUIT\r