← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dovecot/trusty-updates

« back to all changes in this revision

Viewing changes to src/lib-storage/index/index-sync-changes.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (1.15.3) (96.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140108093549-814nkqdcxfbvgktg
Tags: 1:2.2.9-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/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.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-storage/index/index-sync-changes.c
1
 
/* Copyright (c) 2007-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2007-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
10
10
        struct mail_index_view *sync_view;
11
11
        struct mail_index_transaction *sync_trans;
12
12
 
13
 
        ARRAY_DEFINE(syncs, struct mail_index_sync_rec);
 
13
        ARRAY(struct mail_index_sync_rec) syncs;
14
14
        struct mail_index_sync_rec sync_rec;
15
15
        bool dirty_flag_updates;
16
16
};
101
101
        orig_count = array_count(&ctx->syncs);
102
102
 
103
103
        while (uid >= sync_rec->uid1) {
104
 
                if (uid <= sync_rec->uid2 &&
105
 
                    sync_rec->type != MAIL_INDEX_SYNC_TYPE_APPEND) {
 
104
                if (uid <= sync_rec->uid2) {
106
105
                        array_append(&ctx->syncs, sync_rec, 1);
107
106
 
108
107
                        if (sync_rec->type == MAIL_INDEX_SYNC_TYPE_EXPUNGE) {
118
117
                }
119
118
 
120
119
                switch (sync_rec->type) {
121
 
                case MAIL_INDEX_SYNC_TYPE_APPEND:
122
 
                        /* ignore */
123
 
                        memset(sync_rec, 0, sizeof(*sync_rec));
124
 
                        break;
125
120
                case MAIL_INDEX_SYNC_TYPE_EXPUNGE:
126
121
                        break;
127
122
                case MAIL_INDEX_SYNC_TYPE_FLAGS:
128
123
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD:
129
124
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_REMOVE:
130
 
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_RESET:
131
125
                        if (!ctx->dirty_flag_updates)
132
126
                                break;
133
127
 
134
128
                        /* mark the changes as dirty */
135
 
                        mail_index_lookup_seq_range(ctx->sync_view,
136
 
                                                    sync_rec->uid1,
137
 
                                                    sync_rec->uid2,
138
 
                                                    &seq1, &seq2);
 
129
                        (void)mail_index_lookup_seq_range(ctx->sync_view,
 
130
                                                          sync_rec->uid1,
 
131
                                                          sync_rec->uid2,
 
132
                                                          &seq1, &seq2);
139
133
                        memset(sync_rec, 0, sizeof(*sync_rec));
140
134
 
141
135
                        if (seq1 == 0)
184
178
                        break;
185
179
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD:
186
180
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_REMOVE:
187
 
                case MAIL_INDEX_SYNC_TYPE_KEYWORD_RESET:
188
181
                        if (!array_is_created(keywords)) {
189
182
                                /* no existing keywords */
190
183
                                if (syncs[i].type !=