- Fixed the SMTP compliance by making sure RCPT TO addresses are specified

  properly in angle brackets. Recipients provided with CURLOPT_MAIL_RCPT now
  get angle bracket wrapping automatically by libcurl unless the recipient
  starts with an angle bracket as then the app is assumed to deal with that
  properly on its own.

3 files changed, 5 insertions, 5 deletions

diff --git a/tests/data/test802 b/tests/data/test802
index d3114137d..7027c802d 100644
--- a/tests/data/test802
+++ b/tests/data/test802
@@ -36,8 +36,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example
 <protocol>
 EHLO user

 MAIL FROM:802@from

-RCPT TO:802@foo

-RCPT TO:802@foobar.example

+RCPT TO:<802@foo>

+RCPT TO:<802@foobar.example>

 DATA

 QUIT

 </protocol>
diff --git a/tests/data/test803 b/tests/data/test803
index f445e69cb..24ff0d001 100644
--- a/tests/data/test803
+++ b/tests/data/test803
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from 803@from -T -
 <protocol>
 EHLO user

 MAIL FROM:803@from

-RCPT TO:803@foo

+RCPT TO:<803@foo>

 DATA

 QUIT

 </protocol>
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 8c1692464..a97af17a4 100644
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -482,12 +482,12 @@ sub DATA_smtp {
         return; # failure
     }
 
-    if($testno eq "verifiedserver") {
+    if($testno eq "<verifiedserver>") {
         sendcontrol "554 WE ROOLZ: $$\r\n";
         return 0; # don't wait for data now
     }
     else {
-        $testno =~ s/^([0-9]*).*/$1/;
+        $testno =~ s/^([^0-9]*)([0-9]+).*/$2/;
         sendcontrol "354 Show me the mail\r\n";
     }