From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 24 Oct 2016 21:51:28 +0000 (+0200)
Subject: s/recursor/resolver
X-Git-Tag: rec-4.1.0-alpha1~231^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eccac19625bf5c767f39a8f6c1d015a55860ffa;p=thirdparty%2Fpdns.git

s/recursor/resolver
---

diff --git a/docs/markdown/authoritative/howtos.md b/docs/markdown/authoritative/howtos.md
index 8ab3cb8075..9d232aed16 100644
--- a/docs/markdown/authoritative/howtos.md
+++ b/docs/markdown/authoritative/howtos.md
@@ -154,11 +154,11 @@ If you have multiple IP addresses on the internet on one machine, UNIX often sen
 # Using ALIAS records
 The ALIAS record provides a way to have CNAME-like behaviour on the zone apex.
 
-In order to correctly serve ALIAS records, set the [`recursor`](settings.md#recursor)
+In order to correctly serve ALIAS records, set the [`resolver`](settings.md#resolver)
 setting to an existing resolver: 
 
 ```
-recursor=[::1]:5300
+resolver=[::1]:5300
 ```
 
 and add the ALIAS record to your zone apex. e.g.:
diff --git a/docs/markdown/authoritative/recursion.md b/docs/markdown/authoritative/recursion.md
index c7dd4e2c3a..21bf921e42 100644
--- a/docs/markdown/authoritative/recursion.md
+++ b/docs/markdown/authoritative/recursion.md
@@ -1,4 +1,4 @@
-**Warning**: Recursion was remove from the Authoritative Server in version 4.1.0
+**Warning**: Recursion was removed from the Authoritative Server in version 4.1.0
 
 # Recursion with the Authoritative Server
 From 2.9.5 onwards, PowerDNS offers both authoritative nameserving capabilities
diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index a343172339..0c036e293d 100644
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -676,11 +676,17 @@ Seconds to store recursive packets in the PacketCache. See
 
 ## `recursor`
 * IP Address
-* Only used for ALIAS since: 4.1.0
+* Removed in: 4.1.0
 
 If set, recursive queries will be handed to the recursor specified here. See
 ["Recursion"](recursion.md).
 
+## `resolver`
+* IP Address
+* Added in: 4.1.0
+
+Use this resolver for ALIAS and the internal stub resolver.
+
 ## `retrieval-threads`
 * Integer
 * Default: 2
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 2030c94abd..adfa435dbc 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -99,7 +99,7 @@ void declareArguments()
   ::arg().set("signing-threads","Default number of signer threads to start")="3";
   ::arg().set("receiver-threads","Default number of receiver threads to start")="1";
   ::arg().set("queue-limit","Maximum number of milliseconds to queue a query")="1500"; 
-  ::arg().set("recursor","If alias expansion is desired, IP address of a recursing nameserver")="no";
+  ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no";
   ::arg().set("udp-truncation-threshold", "Maximum UDP response size before we truncate")="1680";
   ::arg().set("disable-tcp","Do not listen to TCP queries")="no";
   
@@ -509,8 +509,8 @@ void mainthread()
   Utility::dropUserPrivs(newuid);
 
   // We need to start the Recursor Proxy before doing secpoll, see issue #2453
-  if(::arg().mustDo("recursor")){
-    DP=new DNSProxy(::arg()["recursor"]);
+  if(::arg().mustDo("resolver")){
+    DP=new DNSProxy(::arg()["resolver"]);
     DP->go();
   }
 
diff --git a/pdns/stubquery.cc b/pdns/stubquery.cc
index c6ac515b96..140da8bba9 100644
--- a/pdns/stubquery.cc
+++ b/pdns/stubquery.cc
@@ -43,7 +43,7 @@ try
     exit(EXIT_FAILURE);
   }
 
-  ::arg().set("recursor","If recursion is desired, IP address of a recursing nameserver")="no"; 
+  ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no"; 
 
   reportAllTypes();
   dns_random_init("0123456789abcdef");
diff --git a/pdns/stubresolver.cc b/pdns/stubresolver.cc
index eab830e102..72b90f72ce 100644
--- a/pdns/stubresolver.cc
+++ b/pdns/stubresolver.cc
@@ -50,8 +50,8 @@ void stubParseResolveConf()
     }
   }
 
-  if(::arg().mustDo("recursor"))
-    s_stubresolvers.push_back(ComboAddress(::arg()["recursor"], 53));
+  if(::arg().mustDo("resolver"))
+    s_stubresolvers.push_back(ComboAddress(::arg()["resolver"], 53));
 
   // Last resort, add 127.0.0.1
   if(s_stubresolvers.empty()) {
diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 451a098603..e1a9259d53 100644
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -37,7 +37,7 @@ gsql_master()
 
 	$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
 		--config-name=$backend --socket-dir=./ --no-shuffle \
-		--dnsupdate=yes --recursor=8.8.8.8 --outgoing-axfr-expand-alias=yes \
+		--dnsupdate=yes --resolver=8.8.8.8 --outgoing-axfr-expand-alias=yes \
 		--cache-ttl=$cachettl --dname-processing \
 		--disable-axfr-rectify=yes $lua_prequery &