← Back to branch summary

~ubuntu-branches/ubuntu/trusty/postfix/trusty-updates

« back to all changes in this revision

Viewing changes to src/smtp/smtp_sasl_proto.c

  • Committer: Package Import Robot
  • Author(s): LaMont Jones, LaMont Jones, localization folks
  • Date: 2014-02-11 07:44:30 UTC
  • mfrom: (58.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140211074430-kwkoxdz0fbajn0fj
Tags: 2.11.0-1
http://bugs.debian.org/734893
[LaMont Jones]

* New upstream release: 2.11.0

[localization folks]

* l10n: Updated German translations.  Closes: #734893 (Helge Kreutzmann)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/smtp/smtp_sasl_proto.c
177
177
        /* Session reuse is disabled. */
178
178
    } else {
179
179
#ifndef USE_TLS
180
 
        smtp_sasl_start(session, VAR_SMTP_SASL_OPTS,
181
 
                        var_smtp_sasl_opts);
 
180
        smtp_sasl_start(session, SMTP_X(SASL_OPTS), var_smtp_sasl_opts);
182
181
#else
183
182
        if (session->tls_context == 0)
184
 
            smtp_sasl_start(session, VAR_SMTP_SASL_OPTS,
185
 
                            var_smtp_sasl_opts);
 
183
            smtp_sasl_start(session, SMTP_X(SASL_OPTS), var_smtp_sasl_opts);
186
184
        else if (TLS_CERT_IS_MATCHED(session->tls_context))
187
 
            smtp_sasl_start(session, VAR_SMTP_SASL_TLSV_OPTS,
 
185
            smtp_sasl_start(session, SMTP_X(SASL_TLSV_OPTS),
188
186
                            var_smtp_sasl_tlsv_opts);
189
187
        else
190
 
            smtp_sasl_start(session, VAR_SMTP_SASL_TLS_OPTS,
 
188
            smtp_sasl_start(session, SMTP_X(SASL_TLS_OPTS),
191
189
                            var_smtp_sasl_tls_opts);
192
190
#endif
193
191
        if (smtp_sasl_authenticate(session, why) <= 0) {