byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump version to 0.31-dev

Browse Source 
From: 	  hjp@hjp.at
	Subject: 	PATCH: Return 421 if we are going to disconnect
	Date: 	July 3, 2005 1:23:21 PM PDT
	To: 	  qpsmtpd@perl.org

RFC 2821 says we should return 421, if we disconnect, not 450 or 451.

	hp



git-svn-id: https://svn.perl.org/qpsmtpd/trunk@459 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Ask Bjørn Hansen 2005-07-04 14:39:29 +00:00
parent 3b7bfe9bce
commit df5a2e9d95
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@ -1,3 +1,9 @@
0.31 -
when disconncting with a temporary failure, return 421 rather than
450 or 451. (Peter J. Holzer)
0.30 - 2005/07/05 0.30 - 2005/07/05
Add plugable logging support include sample plugin which replicates Add plugable logging support include sample plugin which replicates

2
lib/Qpsmtpd.pm
View File

@ -5,7 +5,7 @@ use vars qw($VERSION $Logger $TraceLevel $Spool_dir);
use Sys::Hostname; use Sys::Hostname;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
$VERSION = "0.30"; $VERSION = "0.31-dev";
sub version { $VERSION }; sub version { $VERSION };

6
lib/Qpsmtpd/SMTP.pm
View File

@ -272,7 +272,7 @@ sub mail {
elsif ($rc == DENYSOFT_DISCONNECT) { elsif ($rc == DENYSOFT_DISCONNECT) {
$msg ||= $from->format . ', temporarily denied'; $msg ||= $from->format . ', temporarily denied';
$self->log(LOGINFO, "denysoft mail from " . $from->format . " ($msg)"); $self->log(LOGINFO, "denysoft mail from " . $from->format . " ($msg)");
$self->respond(450, $msg); $self->respond(421, $msg);
$self->disconnect; $self->disconnect;
} }
else { # includes OK else { # includes OK
@ -316,7 +316,7 @@ sub rcpt {
elsif ($rc == DENYSOFT_DISCONNECT) { elsif ($rc == DENYSOFT_DISCONNECT) {
$msg ||= 'relaying denied'; $msg ||= 'relaying denied';
$self->log(LOGINFO, "delivery denied ($msg)"); $self->log(LOGINFO, "delivery denied ($msg)");
$self->respond(450, $msg); $self->respond(421, $msg);
$self->disconnect; $self->disconnect;
} }
elsif ($rc == OK) { elsif ($rc == OK) {
@ -413,7 +413,7 @@ sub data {
return 1; return 1;
} }
elsif ($rc == DENYSOFT_DISCONNECT) { elsif ($rc == DENYSOFT_DISCONNECT) {
$self->respond(451, $msg || "Message denied temporarily"); $self->respond(421, $msg || "Message denied temporarily");
$self->disconnect; $self->disconnect;
return 1; return 1;
} }