make it explicit that servfail packets get stored for servfail-packetcache-ttl seconds

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 00887eac1a6892d18ab0d677ce0821ce1be8d39c..19cb2a42429047ddddd6067a7c76be367c02ceb4 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -872,14 +872,13 @@ void startDoResolve(void *p)
         msgh.msg_control=NULL;
       if(sendmsg(dc->d_socket, &msgh, 0) < 0 && g_logCommonErrors) 
         L<<Logger::Warning<<"Sending UDP reply to client "<<dc->d_remote.toStringWithPort()<<" failed with: "<<strerror(errno)<<endl;
-
       if(!SyncRes::s_nopacketcache && !variableAnswer && !sr.wasVariable() ) {
-        t_packetCache->insertResponsePacket(dc->d_tag, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_query, string((const char*)&*packet.begin(), packet.size()),
+
+        t_packetCache->insertResponsePacket(dc->d_tag, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_query, 
+                                            string((const char*)&*packet.begin(), packet.size()),
                                             g_now.tv_sec,
-                                            min(minTTL,
-                                                (pw.getHeader()->rcode == RCode::ServFail) ? SyncRes::s_packetcacheservfailttl : SyncRes::s_packetcachettl
-                                            )
-        );
+                                            pw.getHeader()->rcode == RCode::ServFail ? SyncRes::s_packetcacheservfailttl :
+                                            min(minTTL,SyncRes::s_packetcachettl));
       }
       //      else cerr<<"Not putting in packet cache: "<<sr.wasVariable()<<endl;
     }