← Back to branch summary

~ubuntu-branches/ubuntu/natty/exim4/natty

« back to all changes in this revision

Viewing changes to src/dkim.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-11-05 21:05:47 UTC
  • mfrom: (2.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101105210547-1uqbqxkx1wbin4qm
Tags: 4.72-2ubuntu1
https://launchpad.net/bugs/671615
http://bugs.debian.org/542726
* Merge from debian unstable.  Remaining changes: (LP: #671615)
  - debian/patches/71_exiq_grep_error_on_messages_without_size.dpatch:
    Improve handling of broken messages when "exim4 -bp" (mailq) reports
    lines without size info.
  - Don't declare a Provides: default-mta; in Ubuntu, we want postfix to be
    the default.
  - debian/control: Change build dependencies to MySQL 5.1.
  - debian/{control,rules}: add and enable hardened build for PIE
    (Closes: #542726).    

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dkim.c
92
92
     means there was a processing error somewhere along the way.
93
93
     Log the incident and disable futher verification. */
94
94
  if (!dkim_collect_input) {
95
 
    log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: Error while running this message through validation, disabling signature verification.");
 
95
    log_write(0, LOG_MAIN, "DKIM: Error while running this message through validation, disabling signature verification.");
96
96
    dkim_disable_verify = TRUE;
97
97
    return;
98
98
  }