Merge pull request #4062 from pieterlexis/dnsname-toLogString

DNSName logging fixes

diff --combined pdns/pdns_recursor.cc
index 33c9364a85705ee2aecba7995e7edab99f309f7d,9042550b8eeee6a45e33bf7fc15e8aabba48d2ba..5b016b320b59153aae4285954baa4d2a9e4912a9
--- 1/pdns/pdns_recursor.cc
--- 2/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@@ -607,7 -607,7 +607,7 @@@ void updateResponseStats(int res, cons
  static string makeLoginfo(DNSComboWriter* dc)
  try
  {
-   return "("+dc->d_mdp.d_qname.toString()+"/"+DNSRecordContent::NumberToType(dc->d_mdp.d_qtype)+" from "+(dc->d_remote.toString())+")";
+   return "("+dc->d_mdp.d_qname.toLogString()+"/"+DNSRecordContent::NumberToType(dc->d_mdp.d_qtype)+" from "+(dc->d_remote.toString())+")";
  }
  catch(...)
  {
@@@ -2960,7 -2960,7 +2960,7 @@@ int main(int argc, char **argv
      ::arg().set("setuid","If set, change user id to this uid for more security")="";
      ::arg().set("network-timeout", "Wait this nummer of milliseconds for network i/o")="1500";
      ::arg().set("threads", "Launch this number of threads")="2";
 -    ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1";
 +    ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1"; // if we un-experimental this, need to fix openssl rand seeding for multiple PIDs!
      ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
      ::arg().set("api-config-dir", "Directory where REST API stores config and zones") = "";
      ::arg().set("api-key", "Static pre-shared authentication key for access to the REST API") = "";

diff --combined pdns/zone2ldap.cc
index 208cecb48a36daa3f02f05c9c2239bfa4814b98f,e8750aa15d79acf45cff15554d8542b8f833904a..d2d44ab305469eab8a6dd1d174dcfe9de77792a3
--- 1/pdns/zone2ldap.cc
--- 2/pdns/zone2ldap.cc
+++ b/pdns/zone2ldap.cc
@@@ -6,10 -6,7 +6,10 @@@
   *  This program is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License version 2
   *  the Free Software Foundation
 - *  
 + *
 + *  Additionally, the license of this program contains a special
 + *  exception which allows to distribute the program in binary form when
 + *  it is linked against OpenSSL.
   *
   *  This program is distributed in the hope that it will be useful,
   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@@ -55,7 -52,7 +55,7 @@@ static void callback_simple( unsigned i
  
          if( ! domain.isPartOf(g_zonename) )
          {
-                 cerr << "Domain '" << domain.toString() << "'' not part of '" << g_zonename.toString() << "'"<< endl;
+                 cerr << "Domain '" << domain << "'' not part of '" << g_zonename << "'"<< endl;
                  return;
          }
  
@@@ -205,14 -202,14 +205,14 @@@ int main( int argc, char* argv[] 
                          for( vector<BindDomainInfo>::const_iterator i = domains.begin(); i != domains.end(); i++ )
                          {
                                          if(i->type!="master" && i->type!="slave") {
-                                                 cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name.toString()<<"'"<<endl;
+                                                 cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
                                                  continue;
                                          }
                                  try
                                  {
                                  if( i->name != DNSName(".") && i->name != DNSName("localhost") && i->name != DNSName("0.0.127.in-addr.arpa") )
                                          {
-                                                 cerr << "Parsing file: " << i->filename << ", domain: " << i->name.toString() << endl;
+                                                 cerr << "Parsing file: " << i->filename << ", domain: " << i->name << endl;
                                                  g_zonename = i->name;
                                                  ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory());
                                                  DNSResourceRecord rr;