← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/imap/cmd-close.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/imap/cmd-close.c
1
 
/* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2002-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "imap-common.h"
4
4
#include "imap-commands.h"
9
9
        struct client *client = cmd->client;
10
10
        struct mailbox *mailbox = client->mailbox;
11
11
        struct mail_storage *storage;
 
12
        const char *errstr, *tagged_reply = "OK Close completed.";
 
13
        enum mail_error error = MAIL_ERROR_NONE;
12
14
 
13
15
        if (!client_verify_open_mailbox(cmd))
14
16
                return TRUE;
17
19
        client->mailbox = NULL;
18
20
 
19
21
        storage = mailbox_get_storage(mailbox);
20
 
        if (imap_expunge(mailbox, NULL) < 0)
21
 
                client_send_untagged_storage_error(client, storage);
 
22
        if (imap_expunge(mailbox, NULL) < 0) {
 
23
                errstr = mailbox_get_last_error(mailbox, &error);
 
24
                if (error != MAIL_ERROR_PERM)
 
25
                        client_send_untagged_storage_error(client, storage);
 
26
                else {
 
27
                        tagged_reply = t_strdup_printf(
 
28
                                "OK Closed without expunging: %s", errstr);
 
29
                }
 
30
        }
22
31
        if (mailbox_sync(mailbox, 0) < 0)
23
32
                client_send_untagged_storage_error(client, storage);
24
33
 
25
34
        mailbox_free(&mailbox);
26
35
        client_update_mailbox_flags(client, NULL);
27
36
 
28
 
        client_send_tagline(cmd, "OK Close completed.");
 
37
        client_send_tagline(cmd, tagged_reply);
29
38
        return TRUE;
30
39
}