This patch fixes a signal 11 bug in the SMTPD policy client when SASL support is compiled in but not turned on in the SMTP server. Prereq: "2.1.0" diff -cr /tmp/postfix-2.1.0/src/global/mail_version.h ./src/global/mail_version.h *** /tmp/postfix-2.1.0/src/global/mail_version.h Thu Apr 22 19:00:31 2004 --- ./src/global/mail_version.h Mon May 3 12:57:50 2004 *************** *** 20,27 **** * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ ! #define MAIL_RELEASE_DATE "20040422" ! #define MAIL_VERSION_NUMBER "2.1.0" #define VAR_MAIL_VERSION "mail_version" #ifdef SNAPSHOT --- 20,27 ---- * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ ! #define MAIL_RELEASE_DATE "20040503" ! #define MAIL_VERSION_NUMBER "2.1.1" #define VAR_MAIL_VERSION "mail_version" #ifdef SNAPSHOT diff -cr /tmp/postfix-2.1.0/HISTORY ./HISTORY *** /tmp/postfix-2.1.0/HISTORY Thu Apr 22 15:00:32 2004 --- ./HISTORY Mon May 3 13:31:10 2004 *************** *** 9351,9353 **** --- 9351,9358 ---- overshoot limit (default: smtpd_recipient_overshoot_limit = 1000). Solution in cooperation with Victor Duchovni. Files: smtpd/smtpd.c, smtpd/smtpd_state.c, smtpd/smtpd.h. + + 20040503 + + Bugfix: missing "sasl enabled" guard in the SMTPD policy + client. File: smtpd/smtpd_check.c. diff -cr /tmp/postfix-2.1.0/html/smtpd.8.html ./html/smtpd.8.html *** /tmp/postfix-2.1.0/html/smtpd.8.html Wed Apr 21 17:11:01 2004 --- ./html/smtpd.8.html Mon May 3 13:21:16 2004 *************** *** 434,440 **** Postfix SMTP server starts to increment the error counter with each junk command. ! smtpd_recipient_overshoot_limit (1000) The number of recipients that a remote SMTP client can send in excess of the limit specified with $smtpd_recipient_limit, before the Postfix SMTP --- 434,440 ---- Postfix SMTP server starts to increment the error counter with each junk command. ! smtpd_recipient_overshoot_limit (1000) The number of recipients that a remote SMTP client can send in excess of the limit specified with $smtpd_recipient_limit, before the Postfix SMTP diff -cr /tmp/postfix-2.1.0/mantools/postlink ./mantools/postlink *** /tmp/postfix-2.1.0/mantools/postlink Thu Apr 22 14:42:01 2004 --- ./mantools/postlink Mon May 3 13:30:05 2004 *************** *** 340,345 **** --- 340,346 ---- s;[[:<:]]smtpd_junk_command_limit[[:>:]];&;g s;[[:<:]]smtpd_noop_commands[[:>:]];&;g s;[[:<:]]smtpd_null_access_lookup_key[[:>:]];&;g + s;[[:<:]]smtpd_recipient_overshoot_limit[[:>:]];&;g s;[[:<:]]smtpd_policy_service_max_idle[[:>:]];&;g s;[[:<:]]smtpd_policy_service_max_ttl[[:>:]];&;g s;[[:<:]]smtpd_policy_service_timeout[[:>:]];&;g diff -cr /tmp/postfix-2.1.0/proto/SMTPD_POLICY_README.html ./proto/SMTPD_POLICY_README.html *** /tmp/postfix-2.1.0/proto/SMTPD_POLICY_README.html Sat Apr 10 22:43:21 2004 --- ./proto/SMTPD_POLICY_README.html Fri Apr 23 10:04:43 2004 *************** *** 216,222 ****
1 /etc/postfix/master.cf: ! 2 127.0.0.1:9998 unix - n n - - spawn 3 user=nobody argv=/some/where/policy-server 4 5 /etc/postfix/main.cf: --- 216,222 ----1 /etc/postfix/master.cf: ! 2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/some/where/policy-server 4 5 /etc/postfix/main.cf: *************** *** 340,346 ****1 /etc/postfix/master.cf: ! 2 127.0.0.1:9998 unix - n n - - spawn 3 user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl 4 5 /etc/postfix/main.cf: --- 340,346 ----1 /etc/postfix/master.cf: ! 2 127.0.0.1:9998 inet n n n - - spawn 3 user=nobody argv=/usr/bin/perl /usr/libexec/postfix/greylist.pl 4 5 /etc/postfix/main.cf: diff -cr /tmp/postfix-2.1.0/src/smtpd/smtpd_check.c ./src/smtpd/smtpd_check.c *** /tmp/postfix-2.1.0/src/smtpd/smtpd_check.c Mon Apr 19 15:31:20 2004 --- ./src/smtpd/smtpd_check.c Mon May 3 11:40:13 2004 *************** *** 2870,2880 **** (unsigned long) state->msg_size, #ifdef USE_SASL_AUTH ATTR_TYPE_STR, MAIL_ATTR_SASL_METHOD, ! state->sasl_method ? state->sasl_method : "", ATTR_TYPE_STR, MAIL_ATTR_SASL_USERNAME, ! state->sasl_username ? state->sasl_username : "", ATTR_TYPE_STR, MAIL_ATTR_SASL_SENDER, ! state->sasl_sender ? state->sasl_sender : "", #endif ATTR_TYPE_END, ATTR_FLAG_MISSING, /* Reply attributes. */ --- 2870,2883 ---- (unsigned long) state->msg_size, #ifdef USE_SASL_AUTH ATTR_TYPE_STR, MAIL_ATTR_SASL_METHOD, ! var_smtpd_sasl_enable && state->sasl_method ? ! state->sasl_method : "", ATTR_TYPE_STR, MAIL_ATTR_SASL_USERNAME, ! var_smtpd_sasl_enable && state->sasl_username ? ! state->sasl_username : "", ATTR_TYPE_STR, MAIL_ATTR_SASL_SENDER, ! var_smtpd_sasl_enable && state->sasl_sender ? ! state->sasl_sender : "", #endif ATTR_TYPE_END, ATTR_FLAG_MISSING, /* Reply attributes. */