← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/login-common/ssl-proxy-gnutls.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/login-common/ssl-proxy-gnutls.c
1
 
/* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2002-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "login-common.h"
4
4
#include "ioloop.h"
5
 
#include "network.h"
 
5
#include "net.h"
6
6
#include "hash.h"
7
7
#include "ssl-proxy.h"
8
8
 
149
149
        if (proxy->io_plain != NULL)
150
150
                io_remove(proxy->io_plain);
151
151
 
152
 
        (void)net_disconnect(proxy->fd_ssl);
153
 
        (void)net_disconnect(proxy->fd_plain);
 
152
        net_disconnect(proxy->fd_ssl);
 
153
        net_disconnect(proxy->fd_plain);
154
154
 
155
155
        i_free(proxy);
156
156
 
463
463
        read_dh_parameters(fd, fname);
464
464
        read_rsa_parameters(fd, fname);
465
465
 
466
 
        (void)close(fd);
 
466
        i_close_fd(&fd);
467
467
}
468
468
 
469
469
static void gcrypt_log_handler(void *context ATTR_UNUSED, int level,
519
519
        gnutls_certificate_set_dh_params(x509_cred, dh_params);
520
520
        gnutls_certificate_set_rsa_export_params(x509_cred, rsa_params);
521
521
 
522
 
        ssl_proxies = hash_table_create(system_pool, system_pool, 0,
523
 
                                        NULL, NULL);
 
522
        ssl_proxies = hash_table_create(default_pool, 0, NULL, NULL);
524
523
        ssl_initialized = TRUE;
525
524
}
526
525