From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Mon, 16 Apr 2018 09:12:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into luarec
X-Git-Tag: dnsdist-1.3.1~136^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aa5c5ccc240b5092dce65d9358a17063879e453;p=pdns

Merge remote-tracking branch 'origin/master' into luarec

* origin/master: (241 commits)
  ixfrdist: fix review comments by @rgacogne
  ixfrdist: don't use variable length array
  ixfrdist: reverse no source and ACL checks
  ixfrutil: ensure it does not print by itself
  ixfrdist: use the logging module
  logger: Allow logging with the severity prefix
  auth: Link dnspcap2protobuf against librt when needed
  Update metrics.rst
  requeue serial check if NOTIFY comes in while incoming AXFR is ongoing
  improve slave NOTIFY logging
  Add return 0 for correct exit of set-kind and set-account
  Test dependencies is too recent a feature, disable the uninit test
  rec: Set the RNG parameter to "auto" in the SyncRes unit tests
  Fix the dns_random unit tests, test all available backends
  make lock test pass on macOS
  ixfrdist: update manpage
  ixfrdist: Use workers to handle TCP connections
  Fix a warning on botan >= 2.5.0
  Fix compilation and use of getrandom() when available
  lualang.org -> lua.org
  ...
---

1aa5c5ccc240b5092dce65d9358a17063879e453
diff --cc modules/geoipbackend/geoipbackend.cc
index 6962b39be,9bf646e5f..faf639e33
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@@ -101,10 -99,9 +101,10 @@@ void GeoIPBackend::initialize() 
    }
  
    if (s_geoip_files.empty())
-     L<<Logger::Warning<<"No GeoIP database files loaded!"<<endl;
+     g_log<<Logger::Warning<<"No GeoIP database files loaded!"<<endl;
  
 -  config = YAML::LoadFile(getArg("zones-file"));
 +  if(!getArg("zones-file").empty())
 +    config = YAML::LoadFile(getArg("zones-file"));
  
    for(YAML::Node domain :  config["domains"]) {
      GeoIPDomain dom;