$NetBSD: patch-pdns_dnspacket.cc,v 1.4 2015/03/27 23:37:52 rodent Exp $ Resolve boost symbol ambiguity. Avoid ambiguous abs() call. --- pdns/dnspacket.cc.orig 2015-03-02 13:17:09.000000000 +0000 +++ pdns/dnspacket.cc @@ -312,7 +312,7 @@ void DNSPacket::wrapup() pos->content="."; pw.startRecord(pos->qname, pos->qtype.getCode(), pos->ttl, pos->qclass, (DNSPacketWriter::Place)pos->d_place); - shared_ptr drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); + boost::shared_ptr drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); drc->toPacket(pw); if(pw.size() + 20U > (d_tcp ? 65535 : getMaxReplyLen())) { // 20 = room for EDNS0 pw.rollback(); @@ -601,7 +601,7 @@ bool checkForCorrectTSIG(const DNSPacket string message; q->getTSIGDetails(trc, keyname, &message); - uint64_t now = time(0); + float now = time(0); if(abs(trc->d_time - now) > trc->d_fudge) { L<qdomain<<"' denied: TSIG (key '"<<*keyname<<"') time delta "<< abs(trc->d_time - now)<<" > 'fudge' "<d_fudge<