mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
Merge pull request #9212 from keszybz/null-removal-part-two
Small follow-up to log_struct NULL removal
This commit is contained in:
commit
81f6d448ef
@ -680,8 +680,7 @@ static int session_stop_scope(Session *s, bool force) {
|
||||
"SESSION_ID=%s", s->id,
|
||||
"USER_ID=%s", s->user->name,
|
||||
"LEADER="PID_FMT, s->leader,
|
||||
LOG_MESSAGE("Session %s logged out. Waiting for processes to exit.", s->id),
|
||||
NULL);
|
||||
LOG_MESSAGE("Session %s logged out. Waiting for processes to exit.", s->id));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -575,8 +575,7 @@ void dns_server_warn_downgrade(DnsServer *server) {
|
||||
"MESSAGE_ID=" SD_MESSAGE_DNSSEC_DOWNGRADE_STR,
|
||||
LOG_MESSAGE("Server %s does not support DNSSEC, downgrading to non-DNSSEC mode.", dns_server_string(server)),
|
||||
"DNS_SERVER=%s", dns_server_string(server),
|
||||
"DNS_SERVER_FEATURE_LEVEL=%s", dns_server_feature_level_to_string(server->possible_feature_level),
|
||||
NULL);
|
||||
"DNS_SERVER_FEATURE_LEVEL=%s", dns_server_feature_level_to_string(server->possible_feature_level));
|
||||
|
||||
server->warned_downgrade = true;
|
||||
}
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user