← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/replication/replicator/notify-connection.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/replication/replicator/notify-connection.c
1
 
/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "llist.h"
43
43
{
44
44
        struct notify_sync_request *request = context;
45
45
 
46
 
        o_stream_send_str(request->conn->output, t_strdup_printf(
 
46
        o_stream_nsend_str(request->conn->output, t_strdup_printf(
47
47
                "%c\t%u\n", success ? '+' : '-', request->id));
48
48
 
49
49
        notify_connection_unref(&request->conn);
73
73
                return -1;
74
74
        }
75
75
        if (priority != REPLICATION_PRIORITY_SYNC)
76
 
                replicator_queue_add(conn->queue, args[1], priority);
 
76
                (void)replicator_queue_add(conn->queue, args[1], priority);
77
77
        else if (args[3] == NULL || str_to_uint(args[3], &id) < 0) {
78
78
                i_error("notify client sent invalid sync id: %s", line);
79
79
                return -1;
141
141
        conn->fd = fd;
142
142
        conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
143
143
        conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
 
144
        o_stream_set_no_error_handling(conn->output, TRUE);
144
145
        conn->io = io_add(fd, IO_READ, notify_connection_input, conn);
145
146
        conn->queue = queue;
146
147