← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/fts-squat/fts-backend-squat.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/plugins/fts-squat/fts-backend-squat.c
1
 
/* Copyright (c) 2006-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2006-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
115
115
 
116
116
        perm = mailbox_get_permissions(box);
117
117
        storage = mailbox_get_storage(box);
118
 
        path = mailbox_list_get_path(box->list, box->name,
119
 
                                     MAILBOX_LIST_PATH_TYPE_INDEX);
120
 
        i_assert(*path != '\0'); /* fts already checked this */
 
118
        if (mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_INDEX, &path) <= 0)
 
119
                i_unreached(); /* fts already checked this */
121
120
 
122
121
        mailbox_get_open_status(box, STATUS_UIDVALIDITY, &status);
123
122
        if (storage->set->mmap_disable)
374
373
        i_array_init(&tmp_maybe_uids, 128);
375
374
 
376
375
        dtc = t_str_new(128);
377
 
        if (uni_utf8_to_decomposed_titlecase(arg->value.str,
378
 
                                             strlen(arg->value.str), dtc) < 0)
 
376
        if (backend->backend.ns->user->
 
377
            default_normalizer(arg->value.str, strlen(arg->value.str), dtc) < 0)
379
378
                i_panic("squat: search key not utf8");
380
379
 
381
380
        ret = squat_trie_lookup(backend->trie, str_c(dtc), squat_type,
452
451
                                       &result->maybe_uids);
453
452
                if (ret < 0)
454
453
                        return -1;
455
 
                if (ret > 0)
 
454
                if (ret > 0) {
456
455
                        args->match_always = TRUE;
457
 
                first = FALSE;
 
456
                        first = FALSE;
 
457
                }
458
458
        }
459
459
        return 0;
460
460
}
461
461
 
462
462
struct fts_backend fts_backend_squat = {
463
463
        .name = "squat",
464
 
        .flags = FTS_BACKEND_FLAG_BUILD_DTCASE,
 
464
        .flags = FTS_BACKEND_FLAG_NORMALIZE_INPUT,
465
465
 
466
466
        {
467
467
                fts_backend_squat_alloc,