Lines 163-169
Link Here
|
163 |
return 0; |
163 |
return 0; |
164 |
} |
164 |
} |
165 |
|
165 |
|
166 |
my $comment = $self->_dkmsg_hdr($message); |
166 |
my $comment = $self->_dkstatus($message); |
167 |
$comment ||= ''; |
167 |
$comment ||= ''; |
168 |
$comment =~ s/\s+/ /gs; # no newlines please |
168 |
$comment =~ s/\s+/ /gs; # no newlines please |
169 |
|
169 |
|
Lines 203-216
Link Here
|
203 |
$scan->{domainkeys_signall} = 1; |
203 |
$scan->{domainkeys_signall} = 1; |
204 |
} |
204 |
} |
205 |
|
205 |
|
206 |
my $comment = $self->_dkmsg_hdr($message); |
206 |
my $comment = $self->_dkstatus($message); |
207 |
dbg("dk: comment is '$comment'"); |
207 |
dbg("dk: comment is '$comment'"); |
208 |
} |
208 |
} |
209 |
|
209 |
|
210 |
# get the DK status "header" from the Mail::DomainKeys::Message object |
210 |
# get the DK status from the Mail::DomainKeys::Message object |
211 |
sub _dkmsg_hdr { |
211 |
sub _dkstatus { |
212 |
my ($self, $message) = @_; |
212 |
my ($self, $message) = @_; |
213 |
return $message->header->value(); |
213 |
if (!$message->signed) { |
|
|
214 |
return "no signature"; |
215 |
} |
216 |
return $message->signature->status; |
214 |
} |
217 |
} |
215 |
|
218 |
|
216 |
sub sanitize_header_for_dk { |
219 |
sub sanitize_header_for_dk { |