Commit eae86ba6 authored by Steve Holme's avatar Steve Holme
Browse files

ftpserver.pl: Added support for SMTP HELO command 

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

tests/data/test902

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ RFC821 
<reply>

<servercmd>

REPLY EHLO 500 Command unrecognized

REPLY HELO 250 Already old but still servicing...

</servercmd>

</reply>

tests/ftpserver.pl

+15 −0
Original line number Diff line number Diff line
@@ -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;