Say Received: ... via ESMTP instead of via SMTP when the client
speaks ESMTP. (Hoping this can be a useful SpamAssassin rule). Take out the X-SMTPD header. git-svn-id: https://svn.perl.org/qpsmtpd/trunk@171 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
cb49a9079e
commit
891778b175
8
Changes
8
Changes
@ -1,5 +1,13 @@
|
|||||||
0.27
|
0.27
|
||||||
|
|
||||||
|
Say Received: ... via ESMTP instead of via SMTP when the client
|
||||||
|
speaks ESMTP. (Hoping this can be a useful SpamAssassin rule).
|
||||||
|
|
||||||
|
Take out the X-SMTPD header.
|
||||||
|
|
||||||
|
Add pod documentation and sanity checking of the config to
|
||||||
|
check_badmailfrom
|
||||||
|
|
||||||
Use $ENV{QMAIL} to override /var/qmail for where to find the
|
Use $ENV{QMAIL} to override /var/qmail for where to find the
|
||||||
control/ directory.
|
control/ directory.
|
||||||
|
|
||||||
|
@ -353,7 +353,7 @@ sub data {
|
|||||||
# way a Received: line that is already in the header.
|
# way a Received: line that is already in the header.
|
||||||
|
|
||||||
$header->extract(\@header);
|
$header->extract(\@header);
|
||||||
$header->add("X-SMTPD", "qpsmtpd/".$self->version.", http://develooper.com/code/qpsmtpd/");
|
#$header->add("X-SMTPD", "qpsmtpd/".$self->version.", http://develooper.com/code/qpsmtpd/");
|
||||||
|
|
||||||
$buffer = "";
|
$buffer = "";
|
||||||
|
|
||||||
@ -380,10 +380,12 @@ sub data {
|
|||||||
|
|
||||||
$self->transaction->header($header);
|
$self->transaction->header($header);
|
||||||
|
|
||||||
|
my $smtp = $self->connection->hello eq "ehlo" ? "ESMTP" : "SMTP";
|
||||||
|
|
||||||
$header->add("Received", "from ".$self->connection->remote_info
|
$header->add("Received", "from ".$self->connection->remote_info
|
||||||
." (HELO ".$self->connection->hello_host . ") (".$self->connection->remote_ip
|
." (HELO ".$self->connection->hello_host . ") (".$self->connection->remote_ip
|
||||||
. ") by ".$self->config('me')." (qpsmtpd/".$self->version
|
. ") by ".$self->config('me')." (qpsmtpd/".$self->version
|
||||||
.") with SMTP; ". (strftime('%a, %d %b %Y %H:%M:%S %z', localtime)),
|
.") with $smtp; ". (strftime('%a, %d %b %Y %H:%M:%S %z', localtime)),
|
||||||
0);
|
0);
|
||||||
|
|
||||||
# if we get here without seeing a terminator, the connection is
|
# if we get here without seeing a terminator, the connection is
|
||||||
|
Loading…
Reference in New Issue
Block a user