aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-09-20 22:58:39 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-09-20 23:08:28 +0100
commit517b8e2290fff6858f907ba34cce284901ca96c5 (patch)
tree5858e0ee2a7b4102e636485cba21b69a6894ad59
parentaf44da38d682b1fef97b8d4cf62e183eff6dc345 (diff)
ftpserver.pl: Corrected SMTP QUIT response to be more realistic
-rwxr-xr-xtests/ftpserver.pl16
1 files changed, 13 insertions, 3 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 57da857cb..603302eda 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -688,6 +688,9 @@ sub close_dataconn {
# what set by "RCPT"
my $smtp_rcpt;
+# The type of server (SMTP or ESMTP)
+my $smtp_type;
+
sub EHLO_smtp {
my ($client) = @_;
my @data;
@@ -698,8 +701,11 @@ sub EHLO_smtp {
$client = "[127.0.0.1]";
}
+ # Set the server type to ESMTP
+ $smtp_type = "ESMTP";
+
# Calculate the EHLO response
- push @data, "ESMTP pingpong test server Hello $client";
+ push @data, "$smtp_type pingpong test server Hello $client";
if((@capabilities) || (@auth_mechs)) {
my $mechs;
@@ -891,13 +897,17 @@ sub HELO_smtp {
$client = "[127.0.0.1]";
}
- sendcontrol "250 SMTP pingpong test server Hello $client\r\n";
+ # Set the server type to SMTP
+ $smtp_type = "SMTP";
+
+ # Send the HELO response
+ sendcontrol "250 $smtp_type pingpong test server Hello $client\r\n";
return 0;
}
sub QUIT_smtp {
- sendcontrol "221 byebye\r\n";
+ sendcontrol "221 cURL $smtp_type server signing off\r\n";
return 0;
}