From 43475909cef221cdb2639d49879fa6b04b65ff82 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Feb 2021 20:19:11 +0100
Subject: [PATCH] resolved: drop timestamp parameter to dns_cache_put() we
 don't ever pass

---
 src/resolve/resolved-dns-cache.c       | 5 ++---
 src/resolve/resolved-dns-cache.h       | 1 -
 src/resolve/resolved-dns-transaction.c | 1 -
 src/resolve/resolved-mdns.c            | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index 478141e730c..cf0e221621c 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -672,7 +672,6 @@ int dns_cache_put(
                 bool authenticated,
                 DnssecResult dnssec_result,
                 uint32_t nsec_ttl,
-                usec_t timestamp,
                 int owner_family,
                 const union in_addr_union *owner_address) {
 
@@ -681,6 +680,7 @@ int dns_cache_put(
         DnsAnswerItem *item;
         DnsAnswerFlags flags;
         unsigned cache_keys;
+        usec_t timestamp;
         int r;
 
         assert(c);
@@ -721,8 +721,7 @@ int dns_cache_put(
         /* Make some space for our new entries */
         dns_cache_make_space(c, cache_keys);
 
-        if (timestamp <= 0)
-                timestamp = now(clock_boottime_or_monotonic());
+        timestamp = now(clock_boottime_or_monotonic());
 
         /* Second, add in positive entries for all contained RRs */
         DNS_ANSWER_FOREACH_ITEM(item, answer) {
diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h
index 1d53e5da0da..cfae24fb71c 100644
--- a/src/resolve/resolved-dns-cache.h
+++ b/src/resolve/resolved-dns-cache.h
@@ -33,7 +33,6 @@ int dns_cache_put(
                 bool authenticated,
                 DnssecResult dnssec_result,
                 uint32_t nsec_ttl,
-                usec_t timestamp,
                 int owner_family,
                 const union in_addr_union *owner_address);
 
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index a9b9ebcfe17..c5233a1e195 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -771,7 +771,6 @@ static void dns_transaction_cache_answer(DnsTransaction *t) {
                       t->answer_authenticated,
                       t->answer_dnssec_result,
                       t->answer_nsec_ttl,
-                      0,
                       t->received->family,
                       &t->received->sender);
 }
diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c
index 9f570153261..149d3a45263 100644
--- a/src/resolve/resolved-mdns.c
+++ b/src/resolve/resolved-mdns.c
@@ -319,7 +319,7 @@ static int on_mdns_packet(sd_event_source *s, int fd, uint32_t revents, void *us
                                 dns_transaction_process_reply(t, p);
                 }
 
-                dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, 0, _DNSSEC_RESULT_INVALID, (uint32_t) -1, 0, p->family, &p->sender);
+                dns_cache_put(&scope->cache, scope->manager->enable_cache, NULL, DNS_PACKET_RCODE(p), p->answer, NULL, false, _DNSSEC_RESULT_INVALID, (uint32_t) -1, p->family, &p->sender);
 
         } else if (dns_packet_validate_query(p) > 0)  {
                 log_debug("Got mDNS query packet for id %u", DNS_PACKET_ID(p));