← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/login-common/login-settings.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/login-common/login-settings.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 "login-common.h"
4
4
#include "hostpid.h"
24
24
        DEF(SET_STR, login_log_format_elements),
25
25
        DEF(SET_STR, login_log_format),
26
26
        DEF(SET_STR, login_access_sockets),
 
27
        DEF(SET_STR, director_username_hash),
27
28
 
28
29
        DEF(SET_ENUM, ssl),
29
30
        DEF(SET_STR, ssl_ca),
31
32
        DEF(SET_STR, ssl_key),
32
33
        DEF(SET_STR, ssl_key_password),
33
34
        DEF(SET_STR, ssl_cipher_list),
 
35
        DEF(SET_STR, ssl_protocols),
34
36
        DEF(SET_STR, ssl_cert_username_field),
35
37
        DEF(SET_STR, ssl_client_cert),
36
38
        DEF(SET_STR, ssl_client_key),
 
39
        DEF(SET_STR, ssl_crypto_device),
37
40
        DEF(SET_BOOL, ssl_verify_client_cert),
 
41
        DEF(SET_BOOL, ssl_require_crl),
38
42
        DEF(SET_BOOL, auth_ssl_require_client_cert),
39
43
        DEF(SET_BOOL, auth_ssl_username_from_cert),
40
44
        DEF(SET_BOOL, verbose_ssl),
52
56
static const struct login_settings login_default_settings = {
53
57
        .login_trusted_networks = "",
54
58
        .login_greeting = PACKAGE_NAME" ready.",
55
 
        .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c",
 
59
        .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",
56
60
        .login_log_format = "%$: %s",
57
61
        .login_access_sockets = "",
 
62
        .director_username_hash = "%u",
58
63
 
59
64
        .ssl = "yes:no:required",
60
65
        .ssl_ca = "",
62
67
        .ssl_key = "",
63
68
        .ssl_key_password = "",
64
69
        .ssl_cipher_list = "ALL:!LOW:!SSLv2:!EXP:!aNULL",
 
70
        .ssl_protocols = "!SSLv2",
65
71
        .ssl_cert_username_field = "commonName",
66
72
        .ssl_client_cert = "",
67
73
        .ssl_client_key = "",
 
74
        .ssl_crypto_device = "",
68
75
        .ssl_verify_client_cert = FALSE,
 
76
        .ssl_require_crl = TRUE,
69
77
        .auth_ssl_require_client_cert = FALSE,
70
78
        .auth_ssl_username_from_cert = FALSE,
71
79
        .verbose_ssl = FALSE,
200
208
 
201
209
        memset(&input, 0, sizeof(input));
202
210
        input.roots = login_set_roots;
203
 
        input.module = login_binary.process_name;
204
 
        input.service = login_binary.protocol;
 
211
        input.module = login_binary->process_name;
 
212
        input.service = login_binary->protocol;
205
213
        input.local_name = local_name;
206
214
 
207
215
        if (local_ip != NULL)