2
0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 05:38:06 +00:00

postfix-2.3-20060125

This commit is contained in:
Wietse Venema 2006-01-25 00:00:00 -05:00 committed by Viktor Dukhovni
parent 941f189e65
commit d93eff81da
3 changed files with 12 additions and 3 deletions

View File

@ -11926,8 +11926,13 @@ Apologies for any names omitted.
20060124 20060124
Bugfix: the virtual(8) delivery agent did not insist on Bugfix: the virtual(8) delivery agent did not insist on
privileged operation; this broke change 20060117. File: privileged operation as it should; this broke change 20060117.
virtual/virtual.c. Ralf Hildebrandt. File: virtual/virtual.c.
Bugfix: the TLS sasl security options (change 20060110)
should also be #ifdef USE_TLS, and not only #ifdef
USE_SASL_AUTH. Such feature interference is difficult to
find in testing. Liviu Daia. File: smtp/smtp_sasl_proto.c.
Open problems: Open problems:

View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20060124" #define MAIL_RELEASE_DATE "20060125"
#define MAIL_VERSION_NUMBER "2.3" #define MAIL_VERSION_NUMBER "2.3"
#ifdef SNAPSHOT #ifdef SNAPSHOT

View File

@ -176,15 +176,19 @@ int smtp_sasl_helo_login(SMTP_STATE *state)
ret = smtp_sess_fail(state); ret = smtp_sess_fail(state);
/* Session reuse is disabled. */ /* Session reuse is disabled. */
} else { } else {
#ifdef USE_TLS
if (session->tls_context == 0) if (session->tls_context == 0)
#endif
smtp_sasl_start(session, VAR_SMTP_SASL_OPTS, smtp_sasl_start(session, VAR_SMTP_SASL_OPTS,
var_smtp_sasl_opts); var_smtp_sasl_opts);
#ifdef USE_TLS
else if (session->tls_context->peer_verified == 0) else if (session->tls_context->peer_verified == 0)
smtp_sasl_start(session, VAR_SMTP_SASL_TLS_OPTS, smtp_sasl_start(session, VAR_SMTP_SASL_TLS_OPTS,
var_smtp_sasl_tls_opts); var_smtp_sasl_tls_opts);
else else
smtp_sasl_start(session, VAR_SMTP_SASL_TLSV_OPTS, smtp_sasl_start(session, VAR_SMTP_SASL_TLSV_OPTS,
var_smtp_sasl_tlsv_opts); var_smtp_sasl_tlsv_opts);
#endif
if (smtp_sasl_authenticate(session, why) <= 0) { if (smtp_sasl_authenticate(session, why) <= 0) {
ret = smtp_sess_fail(state); ret = smtp_sess_fail(state);
/* Session reuse is disabled. */ /* Session reuse is disabled. */