cvs commit: qpsmtpd/lib/Qpsmtpd SMTP.pm

cvsuser     04/11/26 22:38:32

  Modified:    lib/Qpsmtpd SMTP.pm
  Log:
  - modify some comments about timeouts
  - remove extraneous pid's from log messages
  
  Revision  Changes    Path
  1.47      +6 -5      qpsmtpd/lib/Qpsmtpd/SMTP.pm
  
  Index: SMTP.pm
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/lib/Qpsmtpd/SMTP.pm,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- SMTP.pm	22 Nov 2004 20:50:57 -0000	1.46
  +++ SMTP.pm	27 Nov 2004 06:38:32 -0000	1.47
  @@ -18,8 +18,10 @@
   use POSIX qw(strftime);
   use Net::DNS;
   
  -# $SIG{ALRM} = sub { respond(421, "Game over pal, game over. You got a
  -# timeout; I just can't wait that long..."); exit };
  +# this is only good for forkserver
  +# 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 {
     my $proto = shift;
  @@ -33,7 +35,6 @@
     my (%commands); @commands{@commands} = ('') x @commands;
     # this list of valid commands should probably be a method or a set of methods
     $self->{_commands} = \%commands;
  -
     $self;
   }
   
  @@ -233,7 +234,7 @@
       ($from) = "<" . ($from_parameter =~ m/^from:\s*(\S+)/i)[0] . ">"
         unless $from;
   
  -    $self->log(LOGWARN, "$$ from email address : [$from]");
  +    $self->log(LOGWARN, "from email address : [$from]");
   
       if ($from eq "<>" or $from =~ m/\[undefined\]/) {
         $from = Qpsmtpd::Address->new("<>");
  @@ -284,7 +285,7 @@
   
     my ($rcpt) = ($_[0] =~ m/to:(.*)/i)[0];
     $rcpt = $_[1] unless $rcpt;
  -  $self->log(LOGWARN, "$$ to email address : [$rcpt]");
  +  $self->log(LOGWARN, "to email address : [$rcpt]");
     $rcpt = (Qpsmtpd::Address->parse($rcpt))[0];
   
     return $self->respond(501, "could not parse recipient") unless $rcpt;