From 2e39551cc99102ecfa063d794c71f54621e976b6 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 20 May 2015 11:57:51 +0200
Subject: [PATCH] secpoll-auth.cc: fix whitespace issues

---
 pdns/secpoll-auth.cc | 50 +++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 7c58a8943..f5424b00c 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -15,7 +15,7 @@
 #include "namespaces.hh"
 #include "statbag.hh"
 #include <stdint.h>
-#ifndef PACKAGEVERSION 
+#ifndef PACKAGEVERSION
 #define PACKAGEVERSION getPDNSVersion()
 #endif
 
@@ -49,16 +49,14 @@ void secPollParseResolveConf()
       vector<string> parts;
       stringtok(parts, line, " \t,"); // be REALLY nice
       for(vector<string>::const_iterator iter = parts.begin()+1; iter != parts.end(); ++iter) {
-	
-	try {
-	  s_servers.push_back(ComboAddress(*iter, 53));
-	}
-	catch(...)
-	{
-	}
+        try {
+          s_secpollresolvers.push_back(ComboAddress(*iter, 53));
+        }
+        catch(...)
+        {
+        }
       }
     }
-
   }
   // Last resort, add 127.0.0.1
   if(s_secpollresolvers.empty()) {
@@ -66,7 +64,7 @@ void secPollParseResolveConf()
   }
 }
 
-int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret) 
+int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret)
 {
   vector<uint8_t> packet;
 
@@ -88,7 +86,7 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
     Socket sock(dest.sin4.sin_family, SOCK_DGRAM);
     sock.setNonBlocking();
     sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest);
-    
+
     string reply;
 
     waitForData(sock.getHandle(), 2, 0);
@@ -96,10 +94,10 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
     retry:
       sock.recvFrom(reply, dest);
       if(reply.size() > sizeof(struct dnsheader)) {
-	struct dnsheader d;
-	memcpy(&d, reply.c_str(), sizeof(d));
-	if(d.id != pw.getHeader()->id)
-	  goto retry;
+        struct dnsheader d;
+        memcpy(&d, reply.c_str(), sizeof(d));
+        if(d.id != pw.getHeader()->id)
+          goto retry;
       }
     }
     catch(...) {
@@ -107,17 +105,17 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
     }
     MOADNSParser mdp(reply);
     if(mdp.d_header.rcode == RCode::ServFail)
-      continue;    
-    
+      continue;
 
-    for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {          
+
+    for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {
       if(i->first.d_place == 1 && i->first.d_type==QType::TXT) {
-	DNSResourceRecord rr;
-	rr.qname = i->first.d_label;
-	rr.qtype = QType(i->first.d_type);
-	rr.content = i->first.d_content->getZoneRepresentation();
-	rr.ttl=i->first.d_ttl;
-	ret.push_back(rr);
+        DNSResourceRecord rr;
+        rr.qname = i->first.d_label;
+        rr.qtype = QType(i->first.d_type);
+        rr.content = i->first.d_content->getZoneRepresentation();
+        rr.ttl=i->first.d_ttl;
+        ret.push_back(rr);
       }
     }
     L<<Logger::Debug<<"Secpoll got answered by "<<dest.toString()<<endl;
@@ -160,9 +158,9 @@ void doSecPoll(bool first)
     if(!content.empty() && content[0]=='"' && content[content.size()-1]=='"') {
       content=content.substr(1, content.length()-2);
     }
-      
+
     pair<string, string> split = splitField(content, ' ');
-    
+
     security_status = atoi(split.first.c_str());
     g_security_message = split.second;
 
-- 
2.49.0