← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/plugins/quota/quota-dirsize.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
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/plugins/quota/quota-dirsize.c
1
 
/* Copyright (c) 2005-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2005-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
/* Quota reporting based on simply summing sizes of all files in mailbox
4
4
   together. */
162
162
                        continue;
163
163
 
164
164
                is_file = mail_storage_is_mailbox_file(namespaces[i]->storage);
165
 
                path = mailbox_list_get_path(namespaces[i]->list, NULL,
166
 
                                             MAILBOX_LIST_PATH_TYPE_DIR);
167
 
                quota_count_path_add(&paths, path, FALSE);
 
165
                if (mailbox_list_get_root_path(namespaces[i]->list,
 
166
                                               MAILBOX_LIST_PATH_TYPE_DIR, &path))
 
167
                        quota_count_path_add(&paths, path, FALSE);
168
168
 
169
169
                /* INBOX may be in different path. */
170
 
                path = mailbox_list_get_path(namespaces[i]->list, "INBOX",
171
 
                                             MAILBOX_LIST_PATH_TYPE_MAILBOX);
172
 
                quota_count_path_add(&paths, path, is_file);
 
170
                if (mailbox_list_get_path(namespaces[i]->list, "INBOX",
 
171
                                          MAILBOX_LIST_PATH_TYPE_MAILBOX, &path) > 0)
 
172
                        quota_count_path_add(&paths, path, is_file);
173
173
        }
174
174
 
175
175
        /* now sum up the found paths */
219
219
                dirsize_quota_root_get_resources,
220
220
                dirsize_quota_get_resource,
221
221
                dirsize_quota_update,
 
222
                NULL,
222
223
                NULL
223
224
        }
224
225
};