ftpserver.pl: Added support for SMTP HELO command

...and updated test902 as explicit HELO response is no longer required.

diff --git a/tests/data/test902 b/tests/data/test902
index 4da1b991293fddcacbcb23e1d277b720bb5e3df7..c61ab93532464d93ee8fb480423f8f9bdc98db52 100644 (file)
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -12,7 +12,6 @@ RFC821
 <reply>
 <servercmd>
 REPLY EHLO 500 Command unrecognized
-REPLY HELO 250 Already old but still servicing...
 </servercmd>
 </reply>
 

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index c1df824084d63c93268d6413df2f1c2b2710cdae..15d00f08fa7e00950686b301768a2f93c2a18e37 100755 (executable)
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -623,6 +623,7 @@ sub protocolsetup {
     elsif($proto eq 'smtp') {
         %commandfunc = (
             'DATA' => \&DATA_smtp,
+            'HELO' => \&HELO_smtp,
             'RCPT' => \&RCPT_smtp,
         );
         %displaytext = (
@@ -772,6 +773,20 @@ sub RCPT_smtp {
     $smtp_rcpt = $args;
 }
 
+sub HELO_smtp {
+    my ($client) = @_;
+
+    # TODO: Get the IP address of the client connection to use in the HELO
+    # response when the client doesn't specify one but for now use 127.0.0.1
+    if (!$client) {
+        $client = "[127.0.0.1]";
+    }
+
+    sendcontrol "250 SMTP pingpong test server Hello $client\r\n";
+
+    return 0;
+}
+
 # What was deleted by IMAP STORE / POP3 DELE commands
 my @deleted;