From 52cefc8cd7ae0faf2c63e645726f2da195d92a49 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 22 Sep 2013 15:14:26 +0100 Subject: tests: Fixed smtp rcpt to addresses --- tests/data/test1320 | 5 ++--- tests/data/test1406 | 10 +++++----- tests/data/test900 | 4 ++-- tests/data/test901 | 4 ++-- tests/data/test902 | 4 ++-- tests/data/test903 | 4 ++-- tests/data/test904 | 4 ++-- tests/data/test905 | 4 ++-- tests/data/test906 | 4 ++-- tests/data/test907 | 4 ++-- tests/data/test908 | 4 ++-- tests/data/test909 | 4 ++-- tests/data/test910 | 4 ++-- tests/data/test911 | 4 ++-- tests/data/test912 | 4 ++-- tests/data/test913 | 2 +- tests/data/test914 | 2 +- 17 files changed, 35 insertions(+), 36 deletions(-) (limited to 'tests') diff --git a/tests/data/test1320 b/tests/data/test1320 index 1caa062b9..7fbefc9d0 100644 --- a/tests/data/test1320 +++ b/tests/data/test1320 @@ -35,7 +35,7 @@ To: another body -smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT +smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@example.com --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT @@ -48,8 +48,7 @@ smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.exa EHLO user MAIL FROM:<1320@example.com> -RCPT TO:<1320@foo> -RCPT TO:<1320@foobar.example> +RCPT TO:<1320@example.com> DATA QUIT diff --git a/tests/data/test1406 b/tests/data/test1406 index ac9824670..b330691fa 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -32,7 +32,7 @@ To: another body -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 +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@example.com --mail-rcpt 1406@foobar.example.com --mail-from 1406@example.com -T log/test1406.eml --libcurl log/test1406.c @@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp EHLO user MAIL FROM:<1406@example.com> SIZE=38 -RCPT TO:<1406@foo> -RCPT TO:<1406@foobar.example> +RCPT TO:<1406@example.com> +RCPT TO:<1406@foobar.example.com> DATA QUIT @@ -68,8 +68,8 @@ int main(int argc, char *argv[]) struct curl_slist *slist1; slist1 = NULL; - slist1 = curl_slist_append(slist1, "1406@foo"); - slist1 = curl_slist_append(slist1, "1406@foobar.example"); + slist1 = curl_slist_append(slist1, "1406@example.com"); + slist1 = curl_slist_append(slist1, "1406@foobar.example.com"); hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_INFILESIZE_LARGE, (curl_off_t)38); diff --git a/tests/data/test900 b/tests/data/test900 index 5fcf598c2..5c30ec620 100644 --- a/tests/data/test900 +++ b/tests/data/test900 @@ -26,7 +26,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-from 900@example.com -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@example.com --mail-from 900@example.com -T - @@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-from 900@example.com -T EHLO user MAIL FROM:<900@example.com> -RCPT TO:<900@foo> +RCPT TO:<900@example.com> DATA QUIT diff --git a/tests/data/test901 b/tests/data/test901 index 8c512eb4a..7d660868f 100644 --- a/tests/data/test901 +++ b/tests/data/test901 @@ -32,7 +32,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from 901@example.com -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@example.com --mail-from 901@example.com -T - @@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from 901@example.com -T EHLO user MAIL FROM:<901@example.com> -RCPT TO:<901@foo> +RCPT TO:<901@example.com> DATA QUIT diff --git a/tests/data/test902 b/tests/data/test902 index 89b10b5b0..e18550139 100644 --- a/tests/data/test902 +++ b/tests/data/test902 @@ -31,7 +31,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@example.com -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@example.com --mail-from 902@example.com -T - @@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@example.com -T EHLO user HELO user MAIL FROM:<902@example.com> -RCPT TO:<902@foo> +RCPT TO:<902@example.com> DATA QUIT diff --git a/tests/data/test903 b/tests/data/test903 index b87b499f9..56ab36ebb 100644 --- a/tests/data/test903 +++ b/tests/data/test903 @@ -31,7 +31,7 @@ SMTP plain authentication mail body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@example.com -u test:1234 -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@example.com --mail-from 903@example.com -u test:1234 -T - @@ -43,7 +43,7 @@ EHLO user AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ= MAIL FROM:<903@example.com> -RCPT TO:<903@foo> +RCPT TO:<903@example.com> DATA QUIT diff --git a/tests/data/test904 b/tests/data/test904 index 66fc7addd..a1d47ba5e 100644 --- a/tests/data/test904 +++ b/tests/data/test904 @@ -31,7 +31,7 @@ SMTP login authentication mail body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@example.com -u test:1234 -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@example.com --mail-from 904@example.com -u test:1234 -T - @@ -44,7 +44,7 @@ AUTH LOGIN dGVzdA== MTIzNA== MAIL FROM:<904@example.com> -RCPT TO:<904@foo> +RCPT TO:<904@example.com> DATA QUIT diff --git a/tests/data/test905 b/tests/data/test905 index 510e1c0ad..e6c4864ea 100644 --- a/tests/data/test905 +++ b/tests/data/test905 @@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication mail body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@example.com -u tim:tanstaaftanstaaf -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@example.com --mail-from 905@example.com -u tim:tanstaaftanstaaf -T - @@ -46,7 +46,7 @@ EHLO user AUTH CRAM-MD5 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw MAIL FROM:<905@example.com> -RCPT TO:<905@foo> +RCPT TO:<905@example.com> DATA QUIT diff --git a/tests/data/test906 b/tests/data/test906 index 1f88990fd..a12b2ebc7 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -26,7 +26,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@example.com -T - @@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T - EHLO user MAIL FROM:<> -RCPT TO:<906@foo> +RCPT TO:<906@example.com> DATA QUIT diff --git a/tests/data/test907 b/tests/data/test907 index 6a7f5820f..0265f2605 100644 --- a/tests/data/test907 +++ b/tests/data/test907 @@ -30,7 +30,7 @@ SMTP plain authentication with initial response mail body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@example.com -u test:1234 --sasl-ir -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@example.com --mail-from 907@example.com -u test:1234 --sasl-ir -T - @@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@example.com -u EHLO user AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ= MAIL FROM:<907@example.com> -RCPT TO:<907@foo> +RCPT TO:<907@example.com> DATA QUIT diff --git a/tests/data/test908 b/tests/data/test908 index 0045d8bc0..f77a61a78 100644 --- a/tests/data/test908 +++ b/tests/data/test908 @@ -30,7 +30,7 @@ SMTP login authentication with initial response mail body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@example.com -u test:1234 --sasl-ir -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@example.com --mail-from 908@example.com -u test:1234 --sasl-ir -T - @@ -42,7 +42,7 @@ EHLO user AUTH LOGIN dGVzdA== MTIzNA== MAIL FROM:<908@example.com> -RCPT TO:<908@foo> +RCPT TO:<908@example.com> DATA QUIT diff --git a/tests/data/test909 b/tests/data/test909 index a8fa3392d..b92a872dd 100644 --- a/tests/data/test909 +++ b/tests/data/test909 @@ -30,7 +30,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-from 909@example.com -T log/test909.eml +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@example.com --mail-from 909@example.com -T log/test909.eml @@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-from 909@example.com -T EHLO user MAIL FROM:<909@example.com> -RCPT TO:<909@foo> +RCPT TO:<909@example.com> DATA QUIT diff --git a/tests/data/test910 b/tests/data/test910 index 05e99c52a..ecf7557e5 100644 --- a/tests/data/test910 +++ b/tests/data/test910 @@ -26,7 +26,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-from 910@example.com -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@example.com --mail-from 910@example.com -T - @@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-from 910@example.com -T EHLO user MAIL FROM:<910@example.com> -RCPT TO:<910@foo> +RCPT TO:<910@example.com> DATA QUIT diff --git a/tests/data/test911 b/tests/data/test911 index 4e0f1b972..18a8fc62a 100644 --- a/tests/data/test911 +++ b/tests/data/test911 @@ -25,7 +25,7 @@ SMTP with no mail data -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-from 911@example.com -T - +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@example.com --mail-from 911@example.com -T - @@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-from 911@example.com -T EHLO user MAIL FROM:<911@example.com> -RCPT TO:<911@foo> +RCPT TO:<911@example.com> DATA QUIT diff --git a/tests/data/test912 b/tests/data/test912 index 7c9d7bbe7..5e3718400 100644 --- a/tests/data/test912 +++ b/tests/data/test912 @@ -30,7 +30,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@example.com -T log/test912.eml +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@example.com --mail-from 912@example.com -T log/test912.eml @@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@example.com -T EHLO user MAIL FROM:<912@example.com> SIZE=38 -RCPT TO:<912@foo> +RCPT TO:<912@example.com> DATA QUIT diff --git a/tests/data/test913 b/tests/data/test913 index fb5d708a8..ceabe1182 100644 --- a/tests/data/test913 +++ b/tests/data/test913 @@ -30,7 +30,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 913@foo --mail-from 913@example.com -T log/test913.eml +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 913@example.com --mail-from 913@example.com -T log/test913.eml diff --git a/tests/data/test914 b/tests/data/test914 index d7ba00c57..c2599f64a 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -26,7 +26,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 914@foo --mail-from invalid -T log/test914.eml +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 914@example.com --mail-from invalid -T log/test914.eml -- cgit v1.2.3