← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/indexer/indexer-client.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:
src/indexer/indexer-client.c
1
 
/* Copyright (c) 2011-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2011-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "llist.h"
94
94
 
95
95
        indexer_queue_append(client->queue, append, args[1], args[2],
96
96
                             max_recent_msgs, ctx);
97
 
        o_stream_send_str(client->output, t_strdup_printf("%u\tOK\n", tag));
 
97
        o_stream_nsend_str(client->output, t_strdup_printf("%u\tOK\n", tag));
98
98
        return 0;
99
99
}
100
100
 
123
123
        }
124
124
 
125
125
        indexer_queue_append_optimize(client->queue, args[1], args[2], ctx);
126
 
        o_stream_send_str(client->output, t_strdup_printf("%u\tOK\n", tag));
 
126
        o_stream_nsend_str(client->output, t_strdup_printf("%u\tOK\n", tag));
127
127
        return 0;
128
128
}
129
129
 
147
147
        }
148
148
}
149
149
 
150
 
static void indexer_client_input(void *context)
 
150
static void indexer_client_input(struct indexer_client *client)
151
151
{
152
 
        struct indexer_client *client = context;
153
152
        const char *line, *const *args, *error;
154
153
 
155
154
        switch (i_stream_read(client->input)) {
192
191
        struct indexer_client_request *ctx = context;
193
192
 
194
193
        T_BEGIN {
195
 
                o_stream_send_str(ctx->client->output,
 
194
                o_stream_nsend_str(ctx->client->output,
196
195
                        t_strdup_printf("%u\t%d\n", ctx->tag, percentage));
197
196
        } T_END;
198
197
        if (percentage < 0 || percentage == 100) {
212
211
        client->fd = fd;
213
212
        client->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
214
213
        client->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
 
214
        o_stream_set_no_error_handling(client->output, TRUE);
215
215
        client->io = io_add(fd, IO_READ, indexer_client_input, client);
216
216
 
217
217
        DLLIST_PREPEND(&clients, client);