From: Zack Allen <zack@riskive.com>
Date: Mon, 6 Jan 2014 16:32:16 +0000 (-0500)
Subject: Changed RecursorBehavior to RecursorBehaviour, reflected in codebase
X-Git-Tag: rec-3.6.0-rc1~261^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=254568963a578738f4bb7edb19ee45572abc0ddf;p=pdns

Changed RecursorBehavior to RecursorBehaviour, reflected in codebase
---

diff --git a/pdns/lua-pdns.cc b/pdns/lua-pdns.cc
index 1935730e2..780825044 100644
--- a/pdns/lua-pdns.cc
+++ b/pdns/lua-pdns.cc
@@ -299,9 +299,9 @@ PowerDNSLua::PowerDNSLua(const std::string& fname)
   // set syslog codes used by Logger/enum Urgency
   pushSyslogSecurityLevelTable(d_lua);
   lua_setfield(d_lua, -2, "loglevels");
-  lua_pushnumber(d_lua, RecursorBehavior::PASS);
+  lua_pushnumber(d_lua, RecursorBehaviour::PASS);
   lua_setfield(d_lua, -2, "PASS");
-  lua_pushnumber(d_lua, RecursorBehavior::DROP);
+  lua_pushnumber(d_lua, RecursorBehaviour::DROP);
   lua_setfield(d_lua, -2, "DROP");
 
   lua_setglobal(d_lua, "pdns");
diff --git a/pdns/lua-pdns.hh b/pdns/lua-pdns.hh
index 14a3e0539..eb85ac9f0 100644
--- a/pdns/lua-pdns.hh
+++ b/pdns/lua-pdns.hh
@@ -30,8 +30,8 @@ protected: // FIXME?
   bool d_variable;  
   ComboAddress d_local;
 };
-// this enum creates constants to track the pdns_recursor behavior when returned from the Lua call 
-namespace RecursorBehavior { enum returnTypes{PASS=-1,DROP=-2}; };
+// this enum creates constants to track the pdns_recursor behaviour when returned from the Lua call 
+namespace RecursorBehaviour { enum returnTypes { PASS=-1, DROP=-2 }; };
 void pushResourceRecordsTable(lua_State* lua, const vector<DNSResourceRecord>& records);
 void popResourceRecordsTable(lua_State *lua, const string &query, vector<DNSResourceRecord>& ret);
 void pushSyslogSecurityLevelTable(lua_State *lua);
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 31c3cb90f..5625a0097 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -563,12 +563,12 @@ void startDoResolve(void *p)
       }
     }
     
-    if(res == RecursorBehavior::DROP) {
+    if(res == RecursorBehaviour::DROP) {
       delete dc;
       dc=0;
       return;
     }  
-    if(tracedQuery || res == RecursorBehavior::PASS || res == RCode::ServFail || pw.getHeader()->rcode == RCode::ServFail)
+    if(tracedQuery || res == RecursorBehaviour::PASS || res == RCode::ServFail || pw.getHeader()->rcode == RCode::ServFail)
     {
       string trace(sr.getTrace());
       if(!trace.empty()) {
@@ -581,7 +581,7 @@ void startDoResolve(void *p)
       }
     }
 
-    if(res == RecursorBehavior::PASS) {
+    if(res == RecursorBehaviour::PASS) {
       pw.getHeader()->rcode=RCode::ServFail;
       // no commit here, because no record
       g_stats.servFails++;