From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Tue, 13 Jun 2017 15:36:44 +0000 (+0200)
Subject: Fix log line corruption for DKIM status
X-Git-Tag: exim-4_89_1~19
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/6b3ab9337d87e3a0585fb990fa2dd40d99c89381

Fix log line corruption for DKIM status

(cherry picked from commit 31323b30449a59713ed7a99f86e356cb1b9d0fb7)
---

diff --git a/src/src/dkim.c b/src/src/dkim.c
index f644fbfdd..044ee3e28 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -169,12 +169,12 @@ for (sig = dkim_signatures; sig; sig = sig->next)
 		: sig->algo == PDKIM_ALGO_RSA_SHA1 ? "rsa-sha1" : "err",
 	string_sprintf(" b=%d",
 			(int)sig->sighash.len > -1 ? sig->sighash.len * 8 : 0));
-  if ((s= sig->identity)) string_append(logmsg, &size, &ptr, 2, " i=", s);
-  if (sig->created > 0) string_append(logmsg, &size, &ptr, 1,
+  if ((s= sig->identity)) logmsg = string_append(logmsg, &size, &ptr, 2, " i=", s);
+  if (sig->created > 0) logmsg = string_append(logmsg, &size, &ptr, 1,
 				      string_sprintf(" t=%lu", sig->created));
-  if (sig->expires > 0) string_append(logmsg, &size, &ptr, 1,
+  if (sig->expires > 0) logmsg = string_append(logmsg, &size, &ptr, 1,
 				      string_sprintf(" x=%lu", sig->expires));
-  if (sig->bodylength > -1) string_append(logmsg, &size, &ptr, 1,
+  if (sig->bodylength > -1) logmsg = string_append(logmsg, &size, &ptr, 1,
 				      string_sprintf(" l=%lu", sig->bodylength));
 
   switch (sig->verify_status)