← Back to branch summary

~ubuntu-branches/ubuntu/wily/dovecot/wily

« back to all changes in this revision

Viewing changes to src/login-common/ssl-proxy-gnutls.c

  • Committer: Package Import Robot
  • Author(s): Jaldhar H. Vyas
  • Date: 2013-09-09 00:57:32 UTC
  • mfrom: (1.13.11)
  • mto: (4.8.5 experimental) (1.16.1)
  • mto: This revision was merged to the branch mainline in revision 97.
  • Revision ID: package-import@ubuntu.com-20130909005732-dn1eell8srqbhh0e
Tags: upstream-2.2.5
Import upstream version 2.2.5

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