From: Wietse Venema Date: Tue, 4 May 2004 05:00:00 +0000 (-0500) Subject: postfix-2.2-20040504 X-Git-Tag: v2.2.0-RC1~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=052c3c2a9c508cbd03d7c2738d0acc92bd53cfc9;p=thirdparty%2Fpostfix.git postfix-2.2-20040504 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index e6af30d4f..34d87b875 100644 --- 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 52d419294..519f99e2c 100644 --- 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 9c513f109..89b6f0558 100644 --- 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. */