← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/doveadm/doveadm-proxy.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:
src/doveadm/doveadm-proxy.c
1
 
/* Copyright (c) 2011 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2011-2012 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "ioloop.h"
47
47
        switch (state) {
48
48
        case IPC_CLIENT_CMD_STATE_REPLY:
49
49
                T_BEGIN {
50
 
                        const char *const *args = t_strsplit(data, "\t");
 
50
                        const char *const *args = t_strsplit_tab(data);
51
51
                        for (; *args != NULL; args++)
52
52
                                doveadm_print(*args);
53
53
                } T_END;
68
68
        ctx = cmd_proxy_init(argc, argv, "a:", cmd_proxy_list);
69
69
 
70
70
        doveadm_print_init(DOVEADM_PRINT_TYPE_TABLE);
71
 
        doveadm_print_header_simple("username");
 
71
        doveadm_print_header("username", "username", DOVEADM_PRINT_HEADER_FLAG_EXPAND);
72
72
        doveadm_print_header("service", "proto", 0);
73
73
        doveadm_print_header("src-ip", "src ip", 0);
74
74
        doveadm_print_header("dest-ip", "dest ip", 0);
75
75
        doveadm_print_header("dest-port", "port", 0);
76
76
 
 
77
        io_loop_set_running(current_ioloop);
77
78
        ipc_client_cmd(ctx->ipc, "proxy\t*\tLIST",
78
79
                       cmd_proxy_list_callback, NULL);
79
 
        io_loop_run(current_ioloop);
 
80
        if (io_loop_is_running(current_ioloop))
 
81
                io_loop_run(current_ioloop);
80
82
        ipc_client_deinit(&ctx->ipc);
81
83
}
82
84