← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pigeonhole/src/managesieve/cmd-getscript.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:
pigeonhole/src/managesieve/cmd-getscript.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"
13
13
struct cmd_getscript_context {
14
14
        struct client *client;
15
15
        struct client_command_context *cmd;
16
 
        struct sieve_storage *storage;  
 
16
        struct sieve_storage *storage;
17
17
        uoff_t script_size, script_offset;
18
18
 
19
19
        struct sieve_script *script;
54
54
 
55
55
        if ( ret < 0 ) {
56
56
                sieve_storage_set_critical(ctx->storage,
57
 
                        "o_stream_send_istream() failed for script `%s' from %s: %m", 
 
57
                        "o_stream_send_istream() failed for script `%s' from %s: %m",
58
58
                        sieve_script_name(ctx->script), sieve_script_location(ctx->script));
59
59
                ctx->failed = TRUE;
60
60
                return cmd_getscript_finish(ctx);
104
104
                ctx->failed = TRUE;
105
105
                return cmd_getscript_finish(ctx);
106
106
        }
107
 
                        
108
 
        ctx->script_stream = sieve_script_open(ctx->script, &error);
109
107
 
110
 
        if ( ctx->script_stream == NULL ) {
 
108
        if ( sieve_script_get_stream
 
109
                (ctx->script, &ctx->script_stream, &error) < 0 ) {
111
110
                if ( error == SIEVE_ERROR_NOT_FOUND )
112
111
                        sieve_storage_set_error(client->storage, error, "Script does not exist.");
113
112
                ctx->failed = TRUE;
122
121
                return cmd_getscript_finish(ctx);
123
122
        }
124
123
 
125
 
        ctx->script_offset = 0; 
 
124
        ctx->script_offset = 0;
126
125
 
127
126
        client_send_line
128
127
                (client, t_strdup_printf("{%"PRIuUOFF_T"}", ctx->script_size));