postfix-3.4-20180823

diff --git a/postfix/HISTORY b/postfix/HISTORY
index e1a036def2859cff5f4f9fb32e8f05206d475d83..f15bb2c77c06321d23892ef8d0b8ada6a424e55f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23642,3 +23642,8 @@ Apologies for any names omitted.
        proto/postconf.proto, smtpd/smtpd.c, smtpd/smtpd_chat.c.
 
        Minor wordsmithing. File: makedefs.
+
+20180823
+
+       Bugfix (introduced: 20180812): postscreen_send.c did not
+       build without warnings. Viktor Dukhovni.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index ea8df8cbb3e68b36840a5625e643df6f9ad80e5b..020e9bc22d720629e849be253bfad3998a223930 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      "20180819"
+#define MAIL_RELEASE_DATE      "20180823"
 #define MAIL_VERSION_NUMBER    "3.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_send.c b/postfix/src/postscreen/postscreen_send.c
index b06155286d6b5ef1212fca85dfd3960e6762acac..69a7fd7218327c85e6bee322814991d61f7473b4 100644 (file)
--- a/postfix/src/postscreen/postscreen_send.c
+++ b/postfix/src/postscreen/postscreen_send.c
@@ -108,8 +108,7 @@ void    pcs_send_pre_jail_init(void)
 
 /* psc_get_footer - find that footer */
 
-static const char *psc_get_footer(PSC_STATE *state, const char *text,
-                                               ssize_t text_len)
+static const char *psc_get_footer(const char *text, ssize_t text_len)
 {
     static VSTRING *footer_buf = 0;
 
@@ -157,7 +156,7 @@ int     psc_send_reply(PSC_STATE *state, const char *text)
      */
     if ((*text == '4' || *text == '5')
        && ((psc_rej_ftr_maps != 0
-       && (footer = psc_get_footer(psc_rej_ftr_maps, text, text_len)) != 0)
+            && (footer = psc_get_footer(text, text_len)) != 0)
            || *(footer = var_psc_rej_footer) != 0))
        smtp_reply_footer(state->send_buf, start, footer,
                          STR(psc_expand_filter), psc_expand_lookup,