placate valgrind + protect powerdns against non-IN queries, we don't deal well with...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@732 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index c5a1fa300b6ee4df1ae14350e5e94f8bee14284c..f8cfa90027e247612034696f5a82ff965398bb7e 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -747,7 +747,6 @@ void makeTCPServerSockets()
   ComboAddress sin;
   for(vector<string>::const_iterator i=locals.begin();i!=locals.end();++i) {
     memset((char *)&sin,0, sizeof(sin));
-    ComboAddress sin;
     sin.sin4.sin_family = AF_INET;
     if(!IpToU32(*i, &sin.sin4.sin_addr.s_addr)) {
       sin.sin6.sin6_family = AF_INET6;

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index f13d0a953a68ced27d81fab6c471eaaa662f20d1..52180b40b578125c3c2f168ba20171bee40b6b1b 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -89,7 +89,10 @@ int SyncRes::beginResolve(const string &qname, const QType &qtype, uint16_t qcla
     ret.push_back(rr);
     return 0;
   }
-
+  
+  if(qclass!=1)
+    return -1;
+  
   set<GetBestNSAnswer> beenthere;
   int res=doResolve(qname, qtype, ret,0,beenthere);
   if(!res)