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

« back to all changes in this revision

Viewing changes to pigeonhole/src/lib-sieve/plugins/relational/ext-relational-common.h

  • 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:
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
#ifndef __EXT_RELATIONAL_COMMON_H
5
5
#define __EXT_RELATIONAL_COMMON_H
6
6
 
9
9
 
10
10
#include "sieve-common.h"
11
11
 
12
 
/* 
13
 
 * Types 
 
12
/*
 
13
 * Types
14
14
 */
15
15
 
16
16
enum ext_relational_match_type {
35
35
#define REL_MATCH(index) \
36
36
        (index % REL_MATCH_INVALID)
37
37
 
38
 
/* 
39
 
 * Extension definitions 
 
38
/*
 
39
 * Extension definitions
40
40
 */
41
41
 
42
42
extern const struct sieve_extension_def relational_extension;
44
44
/*
45
45
 * Match types
46
46
 */
47
 
 
48
 
/* Registered for validation */ 
 
47
 
 
48
/* Registered for validation */
49
49
 
50
50
extern const struct sieve_match_type_def value_match_type;
51
51
extern const struct sieve_match_type_def count_match_type;
69
69
/*
70
70
 * Operand
71
71
 */
72
 
 
 
72
 
73
73
extern const struct sieve_operand_def rel_match_type_operand;
74
74
 
75
75
 
78
78
 */
79
79
 
80
80
bool mcht_relational_validate
81
 
        (struct sieve_validator *validator, struct sieve_ast_argument **arg, 
 
81
        (struct sieve_validator *validator, struct sieve_ast_argument **arg,
82
82
                struct sieve_match_type_context *ctx);
83
 
                
 
83
 
84
84
/*
85
85
 * Value match function (also used by :count)
86
86
 */
87
 
 
 
87
 
88
88
int mcht_value_match_key
89
89
        (struct sieve_match_context *mctx, const char *val, size_t val_size,
90
90
                const char *key, size_t key_size);