- uschar *dkim_log = string_sprintf("DKIM: v=%u d=%s s=%s c=%s/%s a=%s ",
- dkim_signatures->version,
- dkim_signatures->domain,
- dkim_signatures->selector,
- (dkim_signatures->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
- (dkim_signatures->canon_body == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
- (dkim_signatures->algo == PDKIM_ALGO_RSA_SHA256)?"rsa-sha256":"rsa-sha1"
-
-
- (dkim_signatures->identity != NULL)?dkim_signatures->identity:"<void>",
- (dkim_signatures->created>0)?
-
- );
-
- dkim_log = string_cat(dkim_log);
-
-
+ int size = 0;
+ int ptr = 0;
+ uschar *logmsg = string_append(NULL, &size, &ptr, 5,
+
+ string_sprintf( "DKIM: v=%u d=%s s=%s c=%s/%s a=%s ",
+ dkim_signatures->version,
+ dkim_signatures->domain,
+ dkim_signatures->selector,
+ (dkim_signatures->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+ (dkim_signatures->canon_body == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+ (dkim_signatures->algo == PDKIM_ALGO_RSA_SHA256)?"rsa-sha256":"rsa-sha1"
+ ),
+
+ ((dkim_signatures->identity != NULL)?
+ string_sprintf("i=%s ", dkim_signatures->identity)
+ :
+ US""
+ ),
+ ((dkim_signatures->created > 0)?
+ string_sprintf("t=%lu ", dkim_signatures->created)
+ :
+ US""
+ ),
+ ((dkim_signatures->expires > 0)?
+ string_sprintf("x=%lu ", dkim_signatures->expires)
+ :
+ US""
+ ),
+ ((dkim_signatures->bodylength > -1)?
+ string_sprintf("x=%li ", dkim_signatures->bodylength)
+ :
+ US""
+ )
+ );