From: Zbigniew Jędrzejewski-Szmek Date: Wed, 6 Jun 2018 12:55:31 +0000 (+0200) Subject: resolved: reformat message about a revoked trust anchor X-Git-Tag: v239~133^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9212%2Fhead;p=thirdparty%2Fsystemd.git resolved: reformat message about a revoked trust anchor LOG_MESSAGE is just a wrapper, but it keeps the arguments indented together with the format string, so put the argument inside of the macro invocation. (No functional change.) Also use lowercase for "trust anchor" — it should either be all capitaled or not at all, and it's not a proper name, so let's make it all lowercase. Also, add a newline, to make the string more readable. "%s" can expand to something that is quite long. --- diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c index 21c04a59ae1..69e36373302 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/resolve/resolved-dns-trust-anchor.c @@ -630,8 +630,9 @@ static int dns_trust_anchor_remove_revoked(DnsTrustAnchor *d, DnsResourceRecord /* We found the key! Warn the user */ log_struct(LOG_WARNING, "MESSAGE_ID=" SD_MESSAGE_DNSSEC_TRUST_ANCHOR_REVOKED_STR, - LOG_MESSAGE("DNSSEC Trust anchor %s has been revoked. Please update the trust anchor, or upgrade your operating system."), - strna(dns_resource_record_to_string(rr)), + LOG_MESSAGE("DNSSEC trust anchor %s has been revoked.\n" + "Please update the trust anchor, or upgrade your operating system.", + strna(dns_resource_record_to_string(rr))), "TRUST_ANCHOR=%s", dns_resource_record_to_string(rr)); if (dns_answer_size(new_answer) <= 0) {