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

- modify some comments about timeouts

Browse Source 
- remove extraneous pid's from log messages


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@346 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Robert Spier 2004-11-27 06:38:32 +00:00
parent 4394fa064f
commit e10bb78cd3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Qpsmtpd/SMTP.pm
View File

@ -18,8 +18,10 @@ use Mail::Header ();
use POSIX qw(strftime); use POSIX qw(strftime);
use Net::DNS; use Net::DNS;
# $SIG{ALRM} = sub { respond(421, "Game over pal, game over. You got a # this is only good for forkserver
# timeout; I just can't wait that long..."); exit }; # can't set these here, cause forkserver resets them
#$SIG{ALRM} = sub { respond(421, "Game over pal, game over. You got a timeout; I just can't wait that long..."); exit };
#$SIG{ALRM} = sub { warn "Connection Timed Out\n"; exit; };
sub new { sub new {
my $proto = shift; my $proto = shift;
@ -33,7 +35,6 @@ sub new {
my (%commands); @commands{@commands} = ('') x @commands; my (%commands); @commands{@commands} = ('') x @commands;
# this list of valid commands should probably be a method or a set of methods # this list of valid commands should probably be a method or a set of methods
$self->{_commands} = \%commands; $self->{_commands} = \%commands;
$self; $self;
} }
@ -233,7 +234,7 @@ sub mail {
($from) = "<" . ($from_parameter =~ m/^from:\s*(\S+)/i)[0] . ">" ($from) = "<" . ($from_parameter =~ m/^from:\s*(\S+)/i)[0] . ">"
unless $from; unless $from;
$self->log(LOGWARN, "$$ from email address : [$from]"); $self->log(LOGWARN, "from email address : [$from]");
if ($from eq "<>" or $from =~ m/\[undefined\]/) { if ($from eq "<>" or $from =~ m/\[undefined\]/) {
$from = Qpsmtpd::Address->new("<>"); $from = Qpsmtpd::Address->new("<>");
@ -284,7 +285,7 @@ sub rcpt {
my ($rcpt) = ($_[0] =~ m/to:(.*)/i)[0]; my ($rcpt) = ($_[0] =~ m/to:(.*)/i)[0];
$rcpt = $_[1] unless $rcpt; $rcpt = $_[1] unless $rcpt;
$self->log(LOGWARN, "$$ to email address : [$rcpt]"); $self->log(LOGWARN, "to email address : [$rcpt]");
$rcpt = (Qpsmtpd::Address->parse($rcpt))[0]; $rcpt = (Qpsmtpd::Address->parse($rcpt))[0];
return $self->respond(501, "could not parse recipient") unless $rcpt; return $self->respond(501, "could not parse recipient") unless $rcpt;