postfix-2.7-20090712

diff --git a/postfix/HISTORY b/postfix/HISTORY
index b1238575c29078686e991e81137a7022ca1b0e1a..9cd139277c6ec824032569b5d30cac6bf1aa0ba5 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -15318,3 +15318,9 @@ Apologies for any names omitted.
        while Postfix would already be working on the next SMTP
        event (typically, QUIT or MAIL FROM).  Problem diagnosed
        with help from Alban Deniz. File: milter/milter8.c.
+
+20090712
+
+       Cleanup: ${multi_instance_name:postfix}${multi_instance_name
+       ?$multi_instance_name} garbage in Postfix logging is now
+       hopefully gone.  File: global/mail_task.c.

diff --git a/postfix/src/global/mail_task.c b/postfix/src/global/mail_task.c
index 9f2fbc05919d23408b5ff1c709fe1f8f195048fb..b1df611d40bc28acdef4e1338ab470231694e04d 100644 (file)
--- a/postfix/src/global/mail_task.c
+++ b/postfix/src/global/mail_task.c
@@ -59,7 +59,8 @@ const char *mail_task(const char *argv0)
     /* Setenv()-ed from main.cf, or inherited from master. */
     if ((tag = safe_getenv(CONF_ENV_LOGTAG)) == 0)
        /* Check main.cf settings directly, in case set-gid. */
-       tag = var_syslog_name ? var_syslog_name : DEF_SYSLOG_NAME;
+       tag = var_syslog_name ? var_syslog_name :
+           mail_conf_eval(DEF_SYSLOG_NAME);
     vstring_sprintf(canon_name, "%s/%s", tag, argv0);
     return (vstring_str(canon_name));
 }

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index dfde2ad4bd9c74bfd8d20237da2e4855ef276ec7..877572a0205a5212f9847aba5c69b2db28fc3e16 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      "20090711"
+#define MAIL_RELEASE_DATE      "20090712"
 #define MAIL_VERSION_NUMBER    "2.7"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 33c6b927ad33b377f446de8da2829282c20ded95..5d1b20a58d0b582fc4d256e51aa12593a5f62714 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -4464,7 +4464,7 @@ static void smtpd_proto(SMTPD_STATE *state)
                    && (err = milter_unknown_event(smtpd_milters,
                                                   argv[0].strval)) != 0
                    && (err = check_milter_reply(state, err)) != 0) {
-                   smtpd_chat_reply(state, err);
+                   smtpd_chat_reply(state, "%s", err);
                } else
                    smtpd_chat_reply(state, "502 5.5.2 Error: command not recognized");
                state->error_mask |= MAIL_ERROR_PROTOCOL;