← Back to branch summary

~james-page/ubuntu/precise/dovecot/upgrade

« back to all changes in this revision

Viewing changes to src/auth/passdb.c

  • Committer: James Page
  • Date: 2012-04-04 13:33:43 UTC
  • mfrom: (4.1.26 sid)
  • Revision ID: james.page@canonical.com-20120404133343-p5gnx2l7qfb3pf50
http://bugs.debian.org/646508
http://bugs.debian.org/653530
https://launchpad.net/bugs/970782
* Merge from Debian testing (LP: #970782), 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/patches/fix-racey-restart.patch: Backported patch from current
    development release which ensures all child processes terminate prior
    to the main dovecot process.
  + debian/patches/CVE-2011-4318.patch: Dropped - applied upstream
  + 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 2.0.x of dovecot.
* [85ae320] Imported Upstream version 2.0.18
* [9cfd1da] Upped standards version to 3.9.3
* [afb4164] Patch to dovecot-core/postinst so that permissions of symlinked
  certificates aren't modified. (Closes: #646508)
  Thanks Michael Kuhn.
* [bf642ee] Patch to enable hardened build flags.  (Closes: #653530)
  Thanks Moritz Muehlenhoff.
* [00b0d0c] Updated pigeonhole to 0.2.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/auth/passdb.c
63
63
                            const unsigned char **credentials_r, size_t *size_r)
64
64
{
65
65
        const char *wanted_scheme = auth_request->credentials_scheme;
66
 
        const char *plaintext, *username;
 
66
        const char *plaintext, *username, *error;
67
67
        int ret;
68
68
 
69
69
        if (auth_request->prefer_plain_credentials &&
73
73
                wanted_scheme = "";
74
74
        }
75
75
 
76
 
        ret = password_decode(input, input_scheme, credentials_r, size_r);
 
76
        ret = password_decode(input, input_scheme,
 
77
                              credentials_r, size_r, &error);
77
78
        if (ret <= 0) {
78
79
                if (ret < 0) {
79
80
                        auth_request_log_error(auth_request, "password",
80
 
                                "Password in passdb is not in expected scheme %s",
81
 
                                input_scheme);
 
81
                                "Password data is not valid for scheme %s: %s",
 
82
                                input_scheme, error);
82
83
                } else {
83
84
                        auth_request_log_error(auth_request, "password",
84
85
                                "Unknown scheme %s", input_scheme);