postfix-2.3-20060125

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 2aa4a85b4773baeb64f27d5e7acd50f6a7efe395..c523de5ec1fa48a72a946796d3eabb7a6a28c774 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -11926,8 +11926,13 @@ Apologies for any names omitted.
 20060124
 
        Bugfix: the virtual(8) delivery agent did not insist on
-       privileged operation; this broke change 20060117. File:
-       virtual/virtual.c.
+       privileged operation as it should; this broke change 20060117.
+       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:
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index bf49a45aebad0dadb24f989e877c95f889f0acfb..f9f2f75bc48a042c9a31f8e221b24f53383244f0 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20060124"
+#define MAIL_RELEASE_DATE      "20060125"
 #define MAIL_VERSION_NUMBER    "2.3"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtp/smtp_sasl_proto.c b/postfix/src/smtp/smtp_sasl_proto.c
index 0799d2c441edbe724cb2a711f154a94cab69a194..a96bd207480bea2b6ca29dfe666a5c2f498fdfda 100644 (file)
--- a/postfix/src/smtp/smtp_sasl_proto.c
+++ b/postfix/src/smtp/smtp_sasl_proto.c
@@ -176,15 +176,19 @@ int     smtp_sasl_helo_login(SMTP_STATE *state)
        ret = smtp_sess_fail(state);
        /* Session reuse is disabled. */
     } else {
+#ifdef USE_TLS
        if (session->tls_context == 0)
+#endif
            smtp_sasl_start(session, VAR_SMTP_SASL_OPTS, 
                var_smtp_sasl_opts);
+#ifdef USE_TLS
        else if (session->tls_context->peer_verified == 0)
            smtp_sasl_start(session, VAR_SMTP_SASL_TLS_OPTS, 
                var_smtp_sasl_tls_opts);
        else
            smtp_sasl_start(session, VAR_SMTP_SASL_TLSV_OPTS, 
                var_smtp_sasl_tlsv_opts);
+#endif
        if (smtp_sasl_authenticate(session, why) <= 0) {
            ret = smtp_sess_fail(state);
            /* Session reuse is disabled. */