← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pigeonhole/src/lib-sieve/plugins/body/ext-body-common.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:
pigeonhole/src/lib-sieve/plugins/body/ext-body-common.c
192
192
 *   Add requested message body parts to the cache that are missing. 
193
193
 */
194
194
static bool ext_body_parts_add_missing
195
 
(const struct sieve_message_data *msgdata, struct ext_body_message_context *ctx, 
 
195
(struct sieve_message_context *msgctx, struct ext_body_message_context *ctx, 
196
196
        const char * const *content_types, bool decode_to_plain)
197
197
{
 
198
        struct mail *mail = sieve_message_get_mail(msgctx);
198
199
        struct ext_body_part_cached *body_part = NULL, *header_part = NULL;
199
200
        struct message_parser_ctx *parser;
200
201
        struct message_decoder_context *decoder;
212
213
        }
213
214
 
214
215
        /* Get the message stream */
215
 
        if ( mail_get_stream(msgdata->mail, NULL, NULL, &input) < 0 )
 
216
        if ( mail_get_stream(mail, NULL, NULL, &input) < 0 )
216
217
                return FALSE;
217
 
        //if (mail_get_parts(msgdata->mail, &parts) < 0)
 
218
        //if (mail_get_parts(mail, &parts) < 0)
218
219
        //      return FALSE;
219
220
 
220
221
        buffer_set_used_size(ctx->tmp_buffer, 0);
395
396
        T_BEGIN {
396
397
                /* Fill the return_body_parts array */
397
398
                if ( !ext_body_parts_add_missing
398
 
                        (renv->msgdata, ctx, content_types, decode_to_plain != 0) )
 
399
                        (renv->msgctx, ctx, content_types, decode_to_plain != 0) )
399
400
                        result = FALSE;
400
401
        } T_END;
401
402
        
419
420
        buffer_t *buf;
420
421
 
421
422
        if ( ctx->raw_body == NULL ) {
422
 
                struct mail *mail = renv->msgdata->mail;
 
423
                struct mail *mail = sieve_message_get_mail(renv->msgctx);
423
424
                struct istream *input;
424
425
                struct message_size hdr_size, body_size;
425
426
                const unsigned char *data;