From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 21 Feb 2017 14:37:23 +0000 (+0100)
Subject: Merge pull request #4988 from rgacogne/rec-incoming-ecs
X-Git-Tag: rec-4.1.0-alpha1~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c423300cb6cb2b4d2b56b1423895e2475301d72;p=thirdparty%2Fpdns.git

Merge pull request #4988 from rgacogne/rec-incoming-ecs

rec: Add `use-incoming-edns-subnet` to process and pass along ECS
---

7c423300cb6cb2b4d2b56b1423895e2475301d72
diff --cc pdns/lua-recursor4.cc
index dfe1ba1f44,7316173e4c..0749e30b7a
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@@ -25,10 -25,10 +25,11 @@@
  #include "dnsparser.hh"
  #include "syncres.hh"
  #include "namespaces.hh"
- #include "rec_channel.hh" 
+ #include "rec_channel.hh"
+ #include "ednsoptions.hh"
  #include "ednssubnet.hh"
  #include "filterpo.hh"
 +#include "rec-snmp.hh"
  #include <unordered_set>
  
  #if !defined(HAVE_LUA)