sender_permitted_from.diff

[Mark Powell]

Here's a patch against current CVS (1500GMT today) that fixes a couple of
uninitialised values.

-- 
Mark Powell - UNIX System Administrator - The University of Salford
Information Services Division, Clifford Whitworth Building,
Salford University, Manchester, M5 4WT, UK.
Tel: +44 161 295 4837  Fax: +44 161 295 5888  www.pgp.com for PGP key
--- sender_permitted_from       Fri Mar  5 12:46:24 2004
+++ /var/qmail/qpsmtpd/qpsmtpd/plugins/sender_permitted_from    Sat Jul 31 18:10:18 
2004
@@ -30,6 +30,7 @@
 
 sub register {
   my ($self, $qp, @args) = @_;
+  $self->{_args}{spf_deny} = 0;
   %{$self->{_args}} = @args;
   $self->register_hook("mail", "mail_handler");
   $self->register_hook("rcpt", "rcpt_handler");
@@ -60,7 +61,7 @@
   my $from = $sender->user . '@' . $host;
 
   my $ip = $self->qp->connection->remote_ip;
-  my $helo = $self->qp->connection->hello_host;
+  my $helo = defined($self->qp->connection->hello_host) ? 
$self->qp->connection->hello_host : '';
 
   my $query = Mail::SPF::Query->new(ip => $ip, sender => $from, helo => $helo,
                sanitize => 1,
@@ -97,7 +98,8 @@
   }
 
   if ($result eq 'fail' or $result eq 'softfail') {
-    $self->log(LOGDEBUG, "result for $rcpt->address was $result: $comment");
+    #$self->log(LOGDEBUG, "result for $rcpt->address was $result: $comment");
+    $self->log(LOGDEBUG, "result for " . $rcpt->address . " was $result: $comment");
   }
    
   return DECLINED;