picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9212 from keszybz/null-removal-part-two 

Small follow-up to log_struct NULL removal
This commit is contained in:
Lennart Poettering 2018-06-06 17:18:19 +02:00 committed by GitHub
parent bb74418bf1 2cda08fdf3
commit 81f6d448ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/login/logind-session.c
View File

@ -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;

3
src/resolve/resolved-dns-server.c
View File

@ -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;
}

5
src/resolve/resolved-dns-trust-anchor.c
View File

@ -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) {