← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pigeonhole/src/managesieve/managesieve-quota.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:
pigeonhole/src/managesieve/managesieve-quota.c
1
 
/* Copyright (c) 2002-2012 Pigeonhole authors, see the included COPYING file
 
1
/* Copyright (c) 2002-2013 Pigeonhole authors, see the included COPYING file
2
2
 */
3
3
 
4
4
#include "lib.h"
16
16
}
17
17
 
18
18
bool managesieve_quota_check_validsize(struct client *client, size_t size)
19
 
{       
 
19
{
20
20
        uint64_t limit;
21
21
 
22
22
        if ( !sieve_storage_quota_validsize
23
23
                (client->storage, size, &limit) ) {
24
 
                client_send_noresp(client, "QUOTA/MAXSIZE", 
25
 
                        t_strdup_printf("Script is too large (max %llu bytes).", 
 
24
                client_send_noresp(client, "QUOTA/MAXSIZE",
 
25
                        t_strdup_printf("Script is too large (max %llu bytes).",
26
26
                        (unsigned long long int) limit));
27
 
        
 
27
 
28
28
                return FALSE;
29
29
        }
30
30
 
31
31
        return TRUE;
32
32
}
33
 
 
 
33
 
34
34
bool managesieve_quota_check_all
35
35
(struct client *client, const char *scriptname, size_t size)
36
36
{
44
44
                        switch ( quota ) {
45
45
                        case SIEVE_STORAGE_QUOTA_MAXSIZE:
46
46
                                client_send_noresp(client, "QUOTA/MAXSIZE", t_strdup_printf(
47
 
                                        "Script is too large (max %llu bytes).", 
 
47
                                        "Script is too large (max %llu bytes).",
48
48
                                        (unsigned long long int) limit));
49
49
                                break;
50
50
 
51
51
                        case SIEVE_STORAGE_QUOTA_MAXSCRIPTS:
52
52
                                client_send_noresp(client, "QUOTA/MAXSCRIPTS", t_strdup_printf(
53
 
                                        "Script count quota exceeded (max %llu scripts).", 
 
53
                                        "Script count quota exceeded (max %llu scripts).",
54
54
                                        (unsigned long long int) limit));
55
55
                                break;
56
56
 
57
57
                        case SIEVE_STORAGE_QUOTA_MAXSTORAGE:
58
58
                                client_send_noresp(client, "QUOTA/MAXSTORAGE", t_strdup_printf(
59
 
                                        "Script storage quota exceeded (max %llu bytes).", 
 
59
                                        "Script storage quota exceeded (max %llu bytes).",
60
60
                                        (unsigned long long int) limit));
61
61
                                break;
62
62