Merge feb63c9 into 8f14cc0

smtpd · May 26, 2015 · 470fe1e · 470fe1e
2 parents 8f14cc0 + feb63c9
commit 470fe1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/dmarc b/plugins/dmarc
@@ -154,8 +154,9 @@ sub check_dmarc {
     };
 
     my $disposition = $dmarc->result->disposition;
-    my $auth_str = "dmarc=$disposition";
-       $auth_str = " (p=" . $pol->p . ")" if $pol;
+    my $result = $dmarc->result->result;
+    my $auth_str = "dmarc=$result";
+       $auth_str .= " (p=" . $pol->p . ")" if $pol;
 
     if ( $dmarc->result->result eq 'pass' ) {
         $self->log(LOGINFO, "pass");

diff --git a/plugins/helo b/plugins/helo
@@ -345,7 +345,7 @@ sub invalid_localhost {
         $self->log(LOGDEBUG, "pass, is localhost");
         return;
     }
-    if ($host && lc $host eq 'localhost') {
+    if ($host && lc $host ne 'localhost') {
         $self->log(LOGDEBUG, "pass, host is localhost");
         return;
     };