Split received header so it doesn't exceed 78 chars
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@191 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
eff5e69d39
commit
c2fb24c4e4
@ -6,42 +6,9 @@
|
|||||||
# plugins/http_config for details.
|
# plugins/http_config for details.
|
||||||
# http_config http://localhost/~smtpd/config/ http://www.example.com/smtp.pl?config=
|
# http_config http://localhost/~smtpd/config/ http://www.example.com/smtp.pl?config=
|
||||||
|
|
||||||
quit_fortune
|
|
||||||
|
|
||||||
check_earlytalker
|
|
||||||
count_unrecognized_commands 4
|
|
||||||
|
|
||||||
require_resolvable_fromhost
|
|
||||||
|
|
||||||
rhsbl
|
|
||||||
dnsbl
|
|
||||||
check_badmailfrom
|
|
||||||
check_badrcptto
|
|
||||||
check_spamhelo
|
|
||||||
|
|
||||||
# sender_permitted_from
|
|
||||||
|
|
||||||
# this plugin needs to run after all other "rcpt" plugins
|
# this plugin needs to run after all other "rcpt" plugins
|
||||||
check_relay
|
check_relay
|
||||||
|
|
||||||
# content filters
|
|
||||||
klez_filter
|
|
||||||
|
|
||||||
|
|
||||||
# You can run the spamassassin plugin with options. See perldoc
|
|
||||||
# plugins/spamassassin for details.
|
|
||||||
#
|
|
||||||
spamassassin
|
|
||||||
|
|
||||||
# rejects mails with a SA score higher than 20 and munges the subject
|
|
||||||
# of the score is higher than 10.
|
|
||||||
#
|
|
||||||
# spamassassin reject_threshold 20 munge_subject_threshold 10
|
|
||||||
|
|
||||||
|
|
||||||
# run the clamav virus checking plugin
|
|
||||||
# clamav
|
|
||||||
|
|
||||||
# queue the mail with qmail-queue
|
# queue the mail with qmail-queue
|
||||||
queue/qmail-queue
|
queue/qmail-queue
|
||||||
|
|
||||||
|
@ -382,11 +382,12 @@ sub data {
|
|||||||
|
|
||||||
my $smtp = $self->connection->hello eq "ehlo" ? "ESMTP" : "SMTP";
|
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
|
. ")\n 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
|
||||||
# probably dead.
|
# probably dead.
|
||||||
|
Loading…
Reference in New Issue
Block a user