small fixes

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@62 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/ChangeLog b/ChangeLog
index bf5e35dbe8a3c4a8d8fe2d7eb6af10d5cd0cb92f..bf866fd51837ab1c96ce2a4f221329ac6725b9d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Changes since 2.9:
        - fixed very embarrassing bug in bind parser - would die on escaping a '
        - pipebackend back
        - freebsd fixes
+       - Solaris fixes (thanks Mark Bakker, Edvard Tuinder)
+       - removed silly debugging message ('sd.ttl from cache')
+
 
 Changes since 2.8:
        - license

diff --git a/Makefile.am b/Makefile.am
index 4685237b5a013e69409bfb9a17c20840f4a9f89e..c394f38dd861262b999dc8d889a6fff0978177f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS=modules pdns
-EXTRA_DIST=TODO WARNING README HACKING INSTALL ChangeLog
+EXTRA_DIST=TODO WARNING README HACKING INSTALL ChangeLog debian
 
 install-exec-local: 
        @echo "***********************************************************"

diff --git a/README b/README
index 6e990be531f93b80a0e768b320df4dfdbbfb647c..959fb0f87de214c6c2417ddf0eabc4b4a929a9f2 100644 (file)
--- a/README
+++ b/README
@@ -14,8 +14,24 @@ To add multiple modules, try:
 
 $ ./configure --with-modules="mysql mypgsql"
 
-For postgresql, you will probably have to edit modules/mypgsql/Makefile.in -
-see the TODO file
+See http://rtfm.powerdns.com/compiling-powerdns.html for more details.
+
+SOLARIS NOTES
+-------------
+You need gcc 3.x, preferably 3.2!
+If you encounter problems with the Solaris make, gmake is advised
+
+IPv6 is currently (2.9.1.) broken in Solaris, awaiting patches!
+
+FREEBSD NOTES
+-------------
+gcc 2.95.x works. You need to compile using gmake - regular make only appears to
+work, but doesn't in fact.
+
+
+LINUX NOTES
+-----------
+None really.
 
 ---
 

diff --git a/TODO b/TODO
index c4164f10433a609f9aeb10269c3de7b56ca7cf0d..e92785e20471861baed9c2c4887b2741db41d3d7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+bugs:
+       bind backend ANY queries don't work
 
 immediate issues:
        make install installs libraries with a static build which it should
@@ -5,7 +7,7 @@ immediate issues:
 
 
 Things we will not do but hope other people will:
-       - Ports to NetBSD, OpenBSD, Solaris, AIX
+       - Ports to NetBSD, OpenBSD, AIX
 
 Projects we will be working on, but would like help for:
 
@@ -16,6 +18,7 @@ Big things:
        - Add support for TSIG
 
 Medium size things:
+       - 64 bit cleanliness
        - Improve bind 'workalike' mode so we are a drop-in replacement for
          non-resolving bind. We're 90% there.
                Add support for being master/slave in bind mode
@@ -38,8 +41,6 @@ Small things, great for coders new to PowerDNS:
        - 'make distclean' tries to calculate dependencies in
                modules/pgmysqlbackend, which is not needed
 
-       - make sure only Linux gets -D_GNU_SOURCE
-               doesn't hurt other architectures, but its ugly
        - investigate if the following is better for the spgsql driver:
 int SPgSQL::doQuery(const string &query)
 {
@@ -73,6 +74,5 @@ cvs server: Updating pdns
 
        
 Real work:
-       - Solaris version
        - Mac OS X version (has been done, partly)
        - resurrect W2K version
\ No newline at end of file

diff --git a/debian/copyright b/debian/copyright
index 0c54e8f1379cb7c97192cb401ad7db190550fcad..05af99816c421167154af54366e2a8cbe8e6e8e4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,9 +8,8 @@ Copyright and license:
     Copyright 2002 PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    it under the terms of version 2 of the GNU General Public License as
+    published by the Free Software Foundation.
 
     Additionally, the license of this program contains a special
     exception which allows to distribute the program in binary form when

diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc
index a6b25d1b3646bab9b34bffce6c2b0f98f46e1a74..4388d93799dc4202388046e68816bfb15159a092 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.cc
+++ b/modules/gmysqlbackend/gmysqlbackend.cc
@@ -1,4 +1,4 @@
-// $Id: gmysqlbackend.cc,v 1.3 2002/11/29 21:16:10 ahu Exp $ 
+// $Id: gmysqlbackend.cc,v 1.4 2002/12/09 18:34:45 ahu Exp $ 
 #include <string>
 #include <map>
 
@@ -355,7 +355,7 @@ bool gMySQLBackend::createSlaveDomain(const string &ip, const string &domain, co
 bool gMySQLBackend::get(DNSResourceRecord &r)
 {
   // L << "gMySQLBackend get() was called for "<<qtype.getName() << " record: ";
-  SMySQL::row_t row;
+  SSql::row_t row;
   if(d_db->getRow(row)) {
     r.content=row[0];
     r.ttl=atol(row[1].c_str());

diff --git a/modules/gmysqlbackend/gmysqlbackend.hh b/modules/gmysqlbackend/gmysqlbackend.hh
index b36cfa6e4be044bf2ae07e09761b35e2c09a9dc1..20186e0fb84222ffad7157d17260e2a86d6c6ce4 100644 (file)
--- a/modules/gmysqlbackend/gmysqlbackend.hh
+++ b/modules/gmysqlbackend/gmysqlbackend.hh
@@ -1,6 +1,6 @@
 #include <string>
 #include <map>
-#include "smysql.hh"
+#include "ssql.hh"
 
 using namespace std;
 

diff --git a/pdns/pdns.spec b/pdns.spec
similarity index 83%
rename from pdns/pdns.spec
rename to pdns.spec
index 474cd396a3f9fcc2fc04198ca6d3fd34b3c5eb03..37a04cbdea6eaec2ffd0284b018242f77051c136 100644 (file)
--- a/pdns/pdns.spec
+++ b/pdns.spec
@@ -1,6 +1,6 @@
 Buildroot: /tmp/pdns
 Name: pdns
-Version: 2.8
+Version: 2.9.1
 Release: 1
 Summary: extremely powerful and versatile nameserver
 Copyright: see /usr/doc/pdns/copyright
@@ -24,13 +24,8 @@ backend'.
 %files
 %defattr(-,root,root)
 "/usr/sbin/pdns_server"
-"/usr/sbin/pdns_control"
-"/usr/sbin/zone2sql"
-"/usr/doc/pdns/LICENSE"
-"/usr/doc/pdns/README"
-"/usr/doc/pdns/html/"
-"/usr/doc/pdns/pdns.txt"
-"/usr/doc/pdns/pdns.pdf"
+"/usr/bin/pdns_control"
+"/usr/bin/zone2sql"
 %dir "/etc/powerdns/"
 %config(noreplace) "/etc/powerdns/pdns.conf"
 %config "/etc/init.d/pdns"

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 8aa7a5a464e43b7900fb56290ce3eaa908bcec85..62ae03dd82a72251c883a875921935751bfe6955 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -41,7 +41,7 @@ void declareArguments()
 {
   arg().set("local-port","The port on which we listen")="53";
   arg().setSwitch("log-failed-updates","If PDNS should log failed update requests")="";
-  arg().setSwitch("log-dns-details","If PDNS should log failed update requests")="";
+  arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")="";
   arg().set("urlredirector","Where we send hosts to that need to be url redirected")="127.0.0.1";
   arg().set("smtpredirector","Our smtpredir MX host")="a.misconfigured.powerdns.smtp.server";
   arg().set("local-address","Local IP address to which we bind")="0.0.0.0";

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index c5d9415ac7b3346aa61d06a31a6045fa7d4aaf4a..167e8e24ff87a1e1802a67e62e74e00fd4dce235 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: ueberbackend.cc,v 1.2 2002/11/29 22:02:33 ahu Exp $ 
-/* (C) Copyright 2002 PowerDNS.COM BV */\r
+// $Id: ueberbackend.cc,v 1.3 2002/12/09 18:34:45 ahu Exp $ 
+/* (C) Copyright 2002 PowerDNS.COM BV */
 #include "utility.hh"
 #include <string>
 #include <map>
@@ -142,7 +142,7 @@ bool UeberBackend::getSOA(const string &domain, SOAData &sd)
     DNSPacket::fillSOAData(d_answer.content,sd);
     sd.domain_id=d_answer.domain_id;
     sd.ttl=d_answer.ttl;
-    cout<<"from cache: sd.ttl: "<<sd.ttl<<endl;
+
     return true;
   }