postfix-3.4-20180904

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 865455ec949259d9c0684c37b7582580fe4ffadf..59576258475410eb97af0af418d84a5d5e0ce7a8 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23720,3 +23720,10 @@ Apologies for any names omitted.
        that the remote SMTP client was pipelining after sending
        BDAT. Found by Ralf Hildebrandt. File:
        postscreen/postscreen_smtpd.c.
+
+20180904
+
+       Bugfix (introduced: 20180812): parameter name error
+       (postscreen_reject_footer should have been
+       postscreen_reject_footer_maps). Noel Jones (finder) and
+       Viktor Dukhovni (fixer).

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 8a4ae583efe556430a50fe192c9629f83f59f760..1568687d2d4c8c34c7bce12fafc8b8ea6820d8c5 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -3774,7 +3774,7 @@ extern int var_psc_cconn_limit;
 #define DEF_PSC_REJ_FOOTER     "$" VAR_SMTPD_REJ_FOOTER
 extern char *var_psc_rej_footer;
 
-#define VAR_PSC_REJ_FTR_MAPS   "postscreen_reject_footer"
+#define VAR_PSC_REJ_FTR_MAPS   "postscreen_reject_footer_maps"
 #define DEF_PSC_REJ_FTR_MAPS   "$" VAR_SMTPD_REJ_FTR_MAPS
 extern char *var_psc_rej_ftr_maps;
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d4718e14558f636934d43d64e8f074c137314e1b..4a7a95aa56cd5a2827fab1b2b2fcd11715da8170 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      "20180903"
+#define MAIL_RELEASE_DATE      "20180904"
 #define MAIL_VERSION_NUMBER    "3.4"
 
 #ifdef SNAPSHOT