cvs commit: qpsmtpd/plugins/queue qmail-queue

cvsuser     04/11/26 23:08:46

  Modified:    plugins  dnsbl require_resolvable_fromhost
               plugins/queue qmail-queue
  Log:
  emacsisms, more timeouts
  
  Revision  Changes    Path
  1.14      +3 -0      qpsmtpd/plugins/dnsbl
  
  Index: dnsbl
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/dnsbl,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- dnsbl	27 Nov 2004 07:02:23 -0000	1.13
  +++ dnsbl	27 Nov 2004 07:08:45 -0000	1.14
  @@ -67,6 +67,9 @@
     my %dnsbl_zones = map { (split /:/, $_, 2)[0,1] } $self->qp->config('dnsbl_zones');
   
     my $res = new Net::DNS::Resolver;
  +  $res->tcp_timeout(30);
  +  $res->udp_timeout(30);
  +
     my $sel = $conn->notes('dnsbl_sockets') or return "";
     my $remote_ip = $self->qp->connection->remote_ip;
   
  
  
  
  1.3       +3 -1      qpsmtpd/plugins/require_resolvable_fromhost
  
  Index: require_resolvable_fromhost
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/require_resolvable_fromhost,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- require_resolvable_fromhost	8 Sep 2002 13:52:12 -0000	1.2
  +++ require_resolvable_fromhost	27 Nov 2004 07:08:45 -0000	1.3
  @@ -7,7 +7,7 @@
   
   sub mail_handler {
     my ($self, $transaction, $sender) = @_;
  -   
  +
     $sender->format ne "<>"
       and $self->qp->config("require_resolvable_fromhost")
       and !check_dns($sender->host)
  @@ -30,6 +30,8 @@
     return 1 if $host =~ m/^\[(\d{1,3}\.){3}\d{1,3}\]$/;
   
     my $res = new Net::DNS::Resolver;
  +  $res->tcp_timeout(30);
  +  $res->udp_timeout(30);
     return 1 if mx($res, $host);
     my $query = $res->search($host);
     if ($query) {
  
  
  
  1.7       +1 -0      qpsmtpd/plugins/queue/qmail-queue
  
  Index: qmail-queue
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/queue/qmail-queue,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- qmail-queue	5 Mar 2004 12:46:24 -0000	1.6
  +++ qmail-queue	27 Nov 2004 07:08:46 -0000	1.7
  @@ -1,3 +1,4 @@
  +# -*- perl -*-
   =head1 NAME
   
   qmail-queue