← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dovecot/trusty-proposed

« back to all changes in this revision

Viewing changes to pigeonhole/src/managesieve/managesieve-capabilities.c

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Ante Karamatic
  • Date: 2013-02-11 12:41:24 UTC
  • mfrom: (4.1.33 sid)
  • Revision ID: package-import@ubuntu.com-20130211124124-v7bdegzftlhw7yfr
Tags: 1:2.1.7-7ubuntu1
https://launchpad.net/bugs/1117613
https://launchpad.net/bugs/1075456
https://launchpad.net/bugs/671065
[ James Page ]
* Merge from Debian unstable (LP: #1117613, #1075456), 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.
  + 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.
* Dropped changes, included in Debian:
  + d/{control,rules}: enable PIE hardening.
  + d/control: Drop B-D on systemd.
* d/p/mail-stack-delivery.postinst: Updated to ensure that configured SSL
  cert and key locations are used when configuring postfix, sorted out
  formatting.
* d/p/dovecot-core.postinst: Create compat links to old style, existing
  SSL cert and key if found.
* d/rules: Don't pass hardening flags for DRAC plugin.
* d/dovecot-{pop3d,imapd}.prerm: Re-sync with Debian.
* d/dovecot-core.lintian-overrides: Drop override for DRAC plugin as not
  required in Ubuntu.
* d/01-mail-stack-delivery: Renamed 99-mail-stack-delivery to ensure that
  the mail-stack-delivery configuration overrides configuration options
  set elsewhere, updated with new cert/key file locations.

[ Ante Karamatic ]
* Change configuration file for LDA on new installs and upgrades
  (LP: #671065).

Show diffs side-by-side

added added

removed removed

Lines of Context:
pigeonhole/src/managesieve/managesieve-capabilities.c
88
88
 * Sieve environment
89
89
 */
90
90
 
91
 
static const char *sieve_get_homedir(void *context ATTR_UNUSED)
92
 
{
93
 
        return "/tmp";
94
 
}
95
 
 
96
91
static const char *sieve_get_setting
97
92
(void *context, const char *identifier)
98
93
{
101
96
  return plugin_settings_get(set, identifier);
102
97
}
103
98
 
104
 
static const struct sieve_environment sieve_env = {
105
 
        sieve_get_homedir,
 
99
static const struct sieve_callbacks sieve_callbacks = {
 
100
        NULL,
106
101
        sieve_get_setting
107
102
};
108
103
 
113
108
void managesieve_capabilities_dump(void)
114
109
{
115
110
        const struct plugin_settings *global_plugin_settings;
 
111
        struct sieve_environment svenv;
116
112
        struct sieve_instance *svinst;
117
113
        const char *notify_cap;
118
114
        
122
118
 
123
119
        /* Initialize Sieve engine */
124
120
 
125
 
        svinst = sieve_init(&sieve_env, (void *) global_plugin_settings, FALSE);
 
121
        memset((void*)&svenv, 0, sizeof(svenv));
 
122
        svenv.home_dir = "/tmp";
 
123
 
 
124
        svinst = sieve_init
 
125
                (&svenv, &sieve_callbacks, (void *) global_plugin_settings, FALSE);
126
126
 
127
127
        /* Dump capabilities */
128
128