← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/imap-quota/imap-quota-plugin.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/plugins/imap-quota/imap-quota-plugin.c
1
 
/* Copyright (c) 2005-2011 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2005-2012 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "imap-common.h"
4
4
#include "str.h"
74
74
        struct mailbox *box;
75
75
        struct quota_root_iter *iter;
76
76
        struct quota_root *root;
77
 
        enum mailbox_name_status status;
78
 
        const char *mailbox, *storage_name, *name;
 
77
        const char *mailbox, *name;
79
78
        string_t *quotaroot_reply, *quota_reply;
80
79
 
81
80
        /* <mailbox> */
82
81
        if (!client_read_string_args(cmd, 1, &mailbox))
83
82
                return FALSE;
84
83
 
85
 
        ns = client_find_namespace(cmd, mailbox, &storage_name, &status);
 
84
        ns = client_find_namespace(cmd, &mailbox);
86
85
        if (ns == NULL)
87
86
                return TRUE;
88
87
 
95
94
                client_send_tagline(cmd, "NO Not showing other users' quota.");
96
95
                return TRUE;
97
96
        }
98
 
        if (status == MAILBOX_NAME_INVALID) {
99
 
                client_fail_mailbox_name_status(cmd, mailbox, NULL, status);
100
 
                return TRUE;
101
 
        }
102
97
 
103
 
        box = mailbox_alloc(ns->list, storage_name, MAILBOX_FLAG_READONLY |
104
 
                            MAILBOX_FLAG_KEEP_RECENT);
 
98
        box = mailbox_alloc(ns->list, mailbox, MAILBOX_FLAG_READONLY);
105
99
 
106
100
        /* build QUOTAROOT reply and QUOTA reply for all quota roots */
107
101
        quotaroot_reply = t_str_new(128);