Fix log line corruption for DKIM status
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Tue, 13 Jun 2017 15:36:44 +0000 (17:36 +0200)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 13 Jun 2017 18:04:26 +0000 (19:04 +0100)
src/src/dkim.c

index b9dbce68dee24a2b87d66c5924a03e71d4a997e6..03efb18d4c88de1b5dbd1c6f6fcbc3a93b8ea7c1 100644 (file)
@@ -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));
                : 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));
                                      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));
                                      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)
                                      string_sprintf(" l=%lu", sig->bodylength));
 
   switch (sig->verify_status)