cvs commit: qpsmtpd Changes

cvsuser     03/06/10 03:03:58

  Modified:    plugins  dnsbl
               .        Changes
  Log:
    Fix bug in dnsbl that made it sometimes ignore "hits" (thanks to
    James H. Thompson <[email protected]>)
  
  Revision  Changes    Path
  1.8       +9 -4      qpsmtpd/plugins/dnsbl
  
  Index: dnsbl
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/dnsbl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- dnsbl	18 Mar 2003 09:20:26 -0000	1.7
  +++ dnsbl	10 Jun 2003 10:03:57 -0000	1.8
  @@ -47,8 +47,8 @@
   
     $self->log(8, "waiting for dnsbl dns");
   
  -  # don't wait more than 5 seconds here
  -  my @ready = $sel->can_read(5);
  +  # don't wait more than 4 seconds here
  +  my @ready = $sel->can_read(4);
   
     $self->log(8, "DONE waiting for dnsbl dns, got " , scalar @ready, " answers ...") ;
     return '' unless @ready;
  @@ -79,14 +79,19 @@
   	unless $res->errorstring eq "NXDOMAIN";
       }
   
  -    last if $result;
  -
  +    if ($result) {
  +      #kill any other pending I/O
  +      $conn->notes('dnsbl_sockets', undef);
  +      return $conn->notes('dnsbl', $result);
  +    }
     }
   
     if ($sel->count) {
       # loop around if we have dns blacklists left to see results from
       return $self->process_sockets();
     }
  +
  +  # er, the following code doesn't make much sense anymore...
   
     # if there was more to read; then forget it
     $conn->notes('dnsbl_sockets', undef);
  
  
  
  1.46      +7 -0      qpsmtpd/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/Changes,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -w -r1.45 -r1.46
  --- Changes	23 Apr 2003 03:36:36 -0000	1.45
  +++ Changes	10 Jun 2003 10:03:58 -0000	1.46
  @@ -1,5 +1,12 @@
   0.26-dev
   
  +  Add queue/smtp-forward plugin (Matt Sergeant)
  +
  +  Add documentation to Qpsmtpd::Transaction (Matt Sergeant)
  +
  +  Fix bug in dnsbl that made it sometimes ignore "hits" (thanks to
  +  James H. Thompson <[email protected]>)
  +
     Fix bug hiding the error message when an existing configuration file
     isn't readable.