postfix-2.2-20040504

diff --git a/postfix/HISTORY b/postfix/HISTORY
index e6af30d4f83c116917107b91185f1531860d6d35..34d87b875db78307929427e805023bdd041ad441 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -9361,7 +9361,7 @@ Apologies for any names omitted.
 
 20040503
 
-       Bugfix: missing "sasl enabled" guard the SMTPD policy
+       Bugfix: missing "sasl enabled" guard in the SMTPD policy
        client.  File: smtpd/smtpd_check.c.
 
 Open problems:

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 52d419294075d49d1d22733656d5b9e5538e581b..519f99e2c2366ca70625839241ec328a20e8f9ff 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only.
   */
-#define MAIL_RELEASE_DATE      "20040503"
+#define MAIL_RELEASE_DATE      "20040504"
 #define MAIL_VERSION_NUMBER    "2.2"
 
 #define VAR_MAIL_VERSION       "mail_version"

diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index 9c513f109173066727b763a4b0d61d85a51768be..89b6f0558558b9f31a97145bc94703fbddacddf8 100644 (file)
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -2870,11 +2870,14 @@ static int check_policy_service(SMTPD_STATE *state, const char *server,
                          (unsigned long) state->msg_size,
 #ifdef USE_SASL_AUTH
                          ATTR_TYPE_STR, MAIL_ATTR_SASL_METHOD,
-                         state->sasl_method ? state->sasl_method : "",
+                         var_smtpd_sasl_enable && state->sasl_method ?
+                         state->sasl_method : "",
                          ATTR_TYPE_STR, MAIL_ATTR_SASL_USERNAME,
-                         state->sasl_username ? state->sasl_username : "",
+                         var_smtpd_sasl_enable && state->sasl_username ?
+                         state->sasl_username : "",
                          ATTR_TYPE_STR, MAIL_ATTR_SASL_SENDER,
-                         state->sasl_sender ? state->sasl_sender : "",
+                         var_smtpd_sasl_enable && state->sasl_sender ?
+                         state->sasl_sender : "",
 #endif
                          ATTR_TYPE_END,
                          ATTR_FLAG_MISSING,    /* Reply attributes. */