From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 15 Jun 2017 12:34:52 +0000 (+0200)
Subject: Merge pull request #5372 from rgacogne/rec-edns-cache-bees
X-Git-Tag: rec-4.1.0-alpha1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c23c8c6a7e21d79268bc9c3b13616878f3c9294;p=thirdparty%2Fpdns.git

Merge pull request #5372 from rgacogne/rec-edns-cache-bees

rec: Don't take the initial ECS source for a scope one if EDNS is off
---

1c23c8c6a7e21d79268bc9c3b13616878f3c9294
diff --cc pdns/recursor_cache.hh
index c6da875174,9d61149a17..0641ff5314
--- a/pdns/recursor_cache.hh
+++ b/pdns/recursor_cache.hh
@@@ -53,9 -53,9 +53,9 @@@ public
    }
    unsigned int size();
    unsigned int bytes();
 -  int32_t get(time_t, const DNSName &qname, const QType& qt, vector<DNSRecord>* res, const ComboAddress& who, vector<std::shared_ptr<RRSIGRecordContent>>* signatures=0);
 +  int32_t get(time_t, const DNSName &qname, const QType& qt, vector<DNSRecord>* res, const ComboAddress& who, vector<std::shared_ptr<RRSIGRecordContent>>* signatures=0, bool* variable=0);
  
-   void replace(time_t, const DNSName &qname, const QType& qt,  const vector<DNSRecord>& content, const vector<shared_ptr<RRSIGRecordContent>>& signatures, bool auth, boost::optional<Netmask> ednsmask=boost::optional<Netmask>());
+   void replace(time_t, const DNSName &qname, const QType& qt,  const vector<DNSRecord>& content, const vector<shared_ptr<RRSIGRecordContent>>& signatures, bool auth, boost::optional<Netmask> ednsmask=boost::none);
    void doPrune(void);
    uint64_t doDump(int fd);