|
Line
Link Here
|
| 0 |
-- pdns/packethandler.cc |
0 |
++ pdns/packethandler.cc |
|
Lines 558-564
Link Here
|
| 558 |
bool found=false; |
558 |
bool found=false; |
| 559 |
|
559 |
|
| 560 |
string target=p->qdomain; |
560 |
string target=p->qdomain; |
| 561 |
|
561 |
bool noCache=false; |
|
|
562 |
|
| 562 |
if (doDNSCheckRequest(p, r, target)) |
563 |
if (doDNSCheckRequest(p, r, target)) |
| 563 |
goto sendit; |
564 |
goto sendit; |
| 564 |
|
565 |
|
|
Lines 667-677
Link Here
|
| 667 |
else |
668 |
else |
| 668 |
weAuth=false; |
669 |
weAuth=false; |
| 669 |
|
670 |
|
| 670 |
if(p->d.rd && d_doRecursion && !weAuth && DP->sendPacket(p)) { |
|
|
| 671 |
delete r; |
| 672 |
return 0; |
| 673 |
} |
| 674 |
|
671 |
|
|
|
672 |
if(p->d.rd && d_doRecursion && !weAuth) { |
| 673 |
if(DP->sendPacket(p)) { |
| 674 |
delete r; |
| 675 |
return 0; |
| 676 |
} |
| 677 |
else noCache=true; |
| 678 |
} |
| 679 |
|
| 675 |
string::size_type pos; |
680 |
string::size_type pos; |
| 676 |
|
681 |
|
| 677 |
DLOG(L<<"Nothing found so far for '"<<target<<"', do we even have authority over this domain?"<<endl); |
682 |
DLOG(L<<"Nothing found so far for '"<<target<<"', do we even have authority over this domain?"<<endl); |
|
Lines 779-794
Link Here
|
| 779 |
// whatever we've built so far, do additional processing |
784 |
// whatever we've built so far, do additional processing |
| 780 |
|
785 |
|
| 781 |
sendit:; |
786 |
sendit:; |
| 782 |
|
|
|
| 783 |
if(doAdditionalProcessingAndDropAA(p,r)<0) |
787 |
if(doAdditionalProcessingAndDropAA(p,r)<0) |
| 784 |
return 0; |
788 |
return 0; |
| 785 |
|
789 |
|
| 786 |
|
|
|
| 787 |
|
| 788 |
|
| 789 |
|
| 790 |
r->wrapup(); // needed for inserting in cache |
790 |
r->wrapup(); // needed for inserting in cache |
| 791 |
PC.insert(p,r); // in the packet cache |
791 |
if(!noCache) |
|
|
792 |
PC.insert(p,r); // in the packet cache |
| 792 |
} |
793 |
} |
| 793 |
catch(DBException &e) { |
794 |
catch(DBException &e) { |
| 794 |
L<<Logger::Error<<"Database module reported condition which prevented lookup - sending out servfail"<<endl; |
795 |
L<<Logger::Error<<"Database module reported condition which prevented lookup - sending out servfail"<<endl; |