← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/dict/dict-commands.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/dict/dict-commands.c
1
 
/* Copyright (c) 2005-2011 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2005-2012 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
90
90
                return -1;
91
91
        }
92
92
 
93
 
        args = t_strsplit(line, "\t");
 
93
        args = t_strsplit_tab(line);
94
94
        if (str_array_length(args) < 2 ||
95
95
            str_to_uint(args[0], &flags) < 0) {
96
96
                i_error("dict client: ITERATE: broken input");
272
272
        const char *const *args;
273
273
 
274
274
        /* <id> <key> <value> */
275
 
        args = t_strsplit(line, "\t");
 
275
        args = t_strsplit_tab(line);
276
276
        if (str_array_length(args) != 3) {
277
277
                i_error("dict client: SET: broken input");
278
278
                return -1;
291
291
        const char *const *args;
292
292
 
293
293
        /* <id> <key> */
294
 
        args = t_strsplit(line, "\t");
 
294
        args = t_strsplit_tab(line);
295
295
        if (str_array_length(args) != 2) {
296
296
                i_error("dict client: UNSET: broken input");
297
297
                return -1;
311
311
        long long diff;
312
312
 
313
313
        /* <id> <key> <diff> */
314
 
        args = t_strsplit(line, "\t");
 
314
        args = t_strsplit_tab(line);
315
315
        if (str_array_length(args) != 3 ||
316
316
            str_to_llong(args[2], &diff) < 0) {
317
317
                i_error("dict client: ATOMIC_INC: broken input");