Evan H discovered our documentation what out of whack with the source wrt to specifyi...

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

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index a46f6d98bcac12fbf9c6b9b762d928ca9d7b905e..89c540e2eca3f21087e87ac6f83dc513a8cdac8b 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -41,6 +41,7 @@
 #include "dnsparser.hh"
 #include "dnsrecords.hh"
 #include "dnssecinfra.hh" 
+#include "base64.hh"
 
 DNSPacket::DNSPacket() 
 {
@@ -216,7 +217,7 @@ bool DNSPacket::couldBeCached()
 {
   return d_ednsping.empty() && !d_wantsnsid && qclass==QClass::IN;
 }
-#include "base64.hh"
+
 void DNSPacket::addTSIG(DNSPacketWriter& pw)
 {
   string toSign;
@@ -225,8 +226,6 @@ void DNSPacket::addTSIG(DNSPacketWriter& pw)
   
   toSign.append(d_tsigprevious);
   toSign.append(&*pw.getContent().begin(), &*pw.getContent().end());
-  
-  //  cerr<<"toSign size now: "<<toSign.size()<<", keyname '"<<d_tsigkeyname<<"', secret "<<Base64Encode(d_tsigsecret)<<endl;
 
   // now add something that looks a lot like a TSIG record, but isn't
   vector<uint8_t> signVect;
@@ -588,6 +587,7 @@ bool checkForCorrectTSIG(const DNSPacket* q, DNSBackend* B, string* keyname, str
     L<<Logger::Error<<"Packet for domain '"<<q->qdomain<<"' denied: can't find TSIG key with name '"<<*keyname<<"' and algorithm '"<<trc->d_algoName<<"'"<<endl;
     return false;
   }
+  trc->d_algoName += ".sig-alg.reg.int.";
   B64Decode(secret64, *secret);
   bool result=calculateMD5HMAC(*secret, message) == trc->d_mac;
   if(!result) {