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

diff --cc pdns/recursor_cache.hh
index c6da875174bc1905d5023eaa695680df690308a6,9d61149a172562fb1d79c51bb2f4c823da7b6174..0641ff53144a3cce4f2aa4bde757e5c5f7d44e89
--- 1/pdns/recursor_cache.hh
--- 2/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);
  

diff --cc pdns/syncres.cc
Simple merge