← Back to branch summary

~james-page/ubuntu/raring/dovecot/autopkgtest

« back to all changes in this revision

Viewing changes to src/lib-storage/index/dbox-single/sdbox-mail.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-06-11 11:11:54 UTC
  • mfrom: (1.15.2) (4.1.27 sid)
  • Revision ID: package-import@ubuntu.com-20120611111154-678cwbdj6ktgsv1h
Tags: 1:2.1.7-1ubuntu1
* Merge from Debian unstable, 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/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.
  + d/control: Drop B-D on systemd.
* Dropped changes:
  + d/patches/fix-racey-restart.patch: part of 2.1.x, no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-storage/index/dbox-single/sdbox-mail.c
1
 
/* Copyright (c) 2007-2011 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2007-2012 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "ioloop.h"
24
24
 
25
25
        mail_storage_set_critical(_mail->box->storage,
26
26
                                  "dbox %s: Unexpectedly lost uid=%u",
27
 
                                  _mail->box->path, _mail->uid);
 
27
                                  mailbox_get_path(_mail->box), _mail->uid);
28
28
        sdbox_set_mailbox_corrupted(_mail->box);
29
29
}
30
30
 
53
53
                if (ret <= 0) {
54
54
                        mail_storage_set_critical(_mail->box->storage,
55
55
                                "dbox %s: Unexpectedly lost mail being saved",
56
 
                                  _mail->box->path);
 
56
                                  mailbox_get_path(_mail->box));
57
57
                        sdbox_set_mailbox_corrupted(_mail->box);
58
58
                        return -1;
59
59
                }
78
78
                return -1;
79
79
        if (ret == 0) {
80
80
                if (!dbox_file_is_open(mail->open_file))
81
 
                        mail->imail.mail.stats_open_lookup_count++;
 
81
                        _mail->transaction->stats.open_lookup_count++;
82
82
                if (dbox_file_open(mail->open_file, &deleted) <= 0)
83
83
                        return -1;
84
84
                if (deleted) {
98
98
        index_mail_set_seq,
99
99
        index_mail_set_uid,
100
100
        index_mail_set_uid_cache_updates,
 
101
        index_mail_prefetch,
 
102
        index_mail_precache,
 
103
        index_mail_add_temp_wanted_fields,
101
104
 
102
105
        index_mail_get_flags,
103
106
        index_mail_get_keywords,
120
123
        index_mail_update_modseq,
121
124
        NULL,
122
125
        index_mail_expunge,
123
 
        index_mail_parse,
124
126
        index_mail_set_cache_corrupted,
125
127
        index_mail_opened
126
128
};