From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 21 Mar 2015 15:48:54 +0000 (+0100)
Subject: possibly fix up dnssec detection spewing errors, restore default config file location
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~88^2~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd3e0dffbaa7da4f9d42ec0d3dd2f0fd185ccf4;p=thirdparty%2Fpdns.git

possibly fix up dnssec detection spewing errors, restore default config file location
---

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 7f2f40c326..fa56e06004 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -280,7 +280,7 @@ int getEDNSZ(const char* packet, unsigned int len)
   int pos = consumed + 4;
   uint16_t qtype, qclass;
 
-  DNSName aname(packet, len, 12+pos, false, &qtype, &qclass, &consumed);
+  DNSName aname(packet, len, 12+pos, true, &qtype, &qclass, &consumed);
   
   if(qtype!=QType::OPT || 12+pos+consumed+7 >= len)
     return 0;
@@ -1040,7 +1040,7 @@ try
     exit(EXIT_FAILURE);
   }
 #endif
-
+  g_cmdLine.config="/etc/dnsdist.conf";
   struct option longopts[]={ 
     {"config", required_argument, 0, 'C'},
     {"execute", required_argument, 0, 'e'},