]> granicus.if.org Git - pdns/commitdiff
Merge pull request #3617 from pieterlexis/issue-3441-lowercase-outgoing-to-40
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 7 Apr 2016 08:19:02 +0000 (10:19 +0200)
committerPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 7 Apr 2016 08:19:02 +0000 (10:19 +0200)
Add `lowercase-outgoing` to Recursor 4.0

1  2 
docs/markdown/recursor/settings.md
pdns/pdns_recursor.cc
regression-tests.recursor/config.sh

Simple merge
Simple merge
index c257da2a9bc95607afbffa608a50be70e78ca29e,0d36fcffe16e2f97bb5c1fb9fa8e3645293fc2bd..428893cd2cb8ddfc6f6b9fb85bebf2a221528a46
@@@ -484,8 -514,14 +515,15 @@@ api-key=secre
  api-readonly=yes
  forward-zones-file=$(pwd)/recursor-service/forward-zones-file
  
 -socket-dir=$(pwd)/recursor-serviceS
 +socket-dir=$(pwd)/recursor-service
  auth-zones=global.box.answer-cname-in-local.example.net=$(pwd)/recursor-service/global.box.answer-cname-in-local.example.net.zone,auth-zone.example.net=$(pwd)/recursor-service/auth-zone.example.net.zone,another-auth-zone.example.net=$(pwd)/recursor-service/another-auth-zone.example.net.zone
 +loglevel=9
  
  EOF
+ cat > recursor-service2/recursor.conf <<EOF
+ local-port=5300
+ socket-dir=$(pwd)/recursor-service2S
+ lowercase-outgoing=yes
+ EOF