~ubuntu-dev/ubuntu/lucid/dovecot/lucid-201002110912

« back to all changes in this revision

Viewing changes to src/lib-index/mail-cache-fields.c

  • Committer: Bazaar Package Importer
  • Author(s): CHuck Short, Chuck Short
  • Date: 2009-11-06 00:47:29 UTC
  • mfrom: (4.1.9 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106004729-i39n7v9e7d4h51f6
Tags: 1:1.2.6-1ubuntu1
* Merge from debian testing, remaining changes:
  Add new binary pkg dovecot-postfix that integrates postfix and dovecot
  automatically: (LP: #164837)
  + debian/control:
    - add new binary with short description
    - set Architecture all for dovecot-postfix (LP: #329878)
  + debian/dovecot-postfix.postinst:
    - create initial certificate symlinks to snakeoil.
    - set up postfix with postconf to:
      - use Maildir/ as the default mailbox.
      - use dovecot as the sasl authentication server.
      - use dovecot LDA (deliver).
      - use tls for smtp{d} services.
    - fix certificates paths in postfix' main.cf
    - add reject_unauth_destination to postfix' recipient restrictions
    - add reject_unknown_sender_domain to postfix' sender restrictions
    - rename configuration name on remove, delete on purge
    - restart dovecot after linking certificates
    - handle use case when postfix is unconfigurated
   + debian/dovecot-postfix.dirs: create backup directory for postfix's configuration
   + restart postfix and dovecot.
   + debian/dovecot-postfix.postrm:
     - remove all dovecot related configuration from postfix.
     - restart postfix and dovecot.
   + debian/dovecot-common.init:
     - check if /etc/dovecot/dovecot-postfix.conf exists and use it
       as the configuration file if so.
   + debian/patches/warning-ubuntu-postfix.dpatch
     - add warning about dovecot-postfix.conf in dovecot default 
       configuration file
   + debian/patches/dovecot-postfix.conf.diff:
     - Ubuntu server custom changes to the default dovecot configuration for
       better interfation with postfix
     - enable sieve plugin
   + debian/patches/dovecot-postfix.conf.diff:
     + Ubuntu server custom changes to the default dovecot configuration for
       better integration with postfix:
       - enable imap, pop3, imaps, pop3s and managesieve by default.
       - enable dovecot LDA (deliver).
       - enable SASL auth socket in postfix private directory.
   + debian/rules:
     - copy, patch and install dovecot-postfix.conf in /etc/dovecot/.
     - build architecure independent packages too
   + Use Snakeoil SSL certificates by default.
     - debian/control: Depend on ssl-cert.
     - debian/patches/ssl-cert-snakeoil.dpatch: Change default SSL cert
       paths to snakeoil.
     - debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
   + Add autopkgtest to debian/tests/*.
   + Fast TearDown: Update the lsb init header to not stop in level 6.
   + Add ufw integration:
     - Created debian/dovecot-common.ufw.profile.
     - debian/rules:
       + install profile
     - debian/control:
       + Suggest ufw
   + debian/{control,rules}: enable PIE hardening.
   + dovecot-imapd, dovecot-pop3: Replaces dovecot-common (<< 1:1.1). LP: #254721
   + debian/control:
     - Update Vcs-* headers.
   + debian/rules:
     - Create emtpy stamp.h.in files in dovecot-sieve/ and dovecot-managesieve/
       if they're not there since empty files are not included in the diff.gz 
       file.
   + Add SMTP-AUTH support for Outlook (login auth mechanism)
   + Dropped:
     - debian/patches/security-CVE-2009-3235: Applied upstream.
     - debian/patches/fix-pop3-assertion.dpatch: Applied upstream.
     - dovecot-sieve and dovecot-managesieve: Use the debian patches instead.

  [Chuck Short]
  - Updated dovecot-sieve to 0.1.13.
  - Updated dovecot-managesieve to 0.11.9.

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
 
77
77
        new_idx = cache->fields_count;
78
78
        for (i = 0; i < fields_count; i++) {
79
 
                if (hash_lookup_full(cache->field_name_hash, fields[i].name,
80
 
                                     &orig_key, &orig_value)) {
 
79
                if (hash_table_lookup_full(cache->field_name_hash,
 
80
                                           fields[i].name,
 
81
                                           &orig_key, &orig_value)) {
81
82
                        i_assert(fields[i].type < MAIL_CACHE_FIELD_COUNT);
82
83
 
83
84
                        fields[i].idx =
128
129
                if (!field_has_fixed_size(cache->fields[idx].field.type))
129
130
                        cache->fields[idx].field.field_size = (unsigned int)-1;
130
131
 
131
 
                hash_insert(cache->field_name_hash, name, POINTER_CAST(idx));
 
132
                hash_table_insert(cache->field_name_hash,
 
133
                                  name, POINTER_CAST(idx));
132
134
        }
133
135
        cache->fields_count = new_idx;
134
136
}
138
140
{
139
141
        void *orig_key, *orig_value;
140
142
 
141
 
        if (hash_lookup_full(cache->field_name_hash, name,
142
 
                             &orig_key, &orig_value))
 
143
        if (hash_table_lookup_full(cache->field_name_hash, name,
 
144
                                   &orig_key, &orig_value))
143
145
                return POINTER_CAST_TO(orig_value, unsigned int);
144
146
        else
145
147
                return (unsigned int)-1;
341
343
                        return -1;
342
344
                }
343
345
 
344
 
                if (hash_lookup_full(cache->field_name_hash, names,
345
 
                                     &orig_key, &orig_value)) {
 
346
                if (hash_table_lookup_full(cache->field_name_hash, names,
 
347
                                           &orig_key, &orig_value)) {
346
348
                        /* already exists, see if decision can be updated */
347
349
                        fidx = POINTER_CAST_TO(orig_value, unsigned int);
348
350
                        if (!cache->fields[fidx].decision_dirty) {