← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dovecot/saucy-security

« back to all changes in this revision

Viewing changes to src/lib-mail/message-id.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-04-04 14:56:38 UTC
  • mfrom: (1.15.1) (4.1.26 sid)
  • Revision ID: package-import@ubuntu.com-20120404145638-qmvdul6vwpcqparv
Tags: 1:2.0.19-0ubuntu1
https://launchpad.net/bugs/970782
* New upstream release (LP: #970782).
* Merge from Debian testing, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/{control,rules}: enable PIE hardening.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst:
      Convert init script to upstart.
  + d/patches/fix-racey-restart.patch: Backported patch from current
    development release which ensures all child processes terminate prior
    to the main dovecot process.
  + debian/patches/CVE-2011-4318.patch: Dropped - applied upstream
  + d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
    xz compression in Ubuntu.
  + d/control: Demote dovecot-common Recommends: to Suggests: to prevent
    install of extra packages on upgrade.
* d/patches/dovecot-drac.patch: Updated with version for dovecot >= 2.0.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-mail/message-id.c
8
8
static bool get_untokenized_msgid(const char **msgid_p, string_t *msgid)
9
9
{
10
10
        struct rfc822_parser_context parser;
 
11
        int ret;
11
12
 
12
13
        rfc822_parser_init(&parser, (const unsigned char *)*msgid_p,
13
14
                           strlen(*msgid_p), NULL);
22
23
 
23
24
        (void)rfc822_skip_lwsp(&parser);
24
25
 
25
 
        if (rfc822_parse_dot_atom(&parser, msgid) <= 0)
 
26
        if (*parser.data == '"')
 
27
                ret = rfc822_parse_quoted_string(&parser, msgid);
 
28
        else
 
29
                ret = rfc822_parse_dot_atom(&parser, msgid);
 
30
        if (ret <= 0)
26
31
                return FALSE;
27
32
 
28
33
        if (*parser.data != '@')