Merge commit 'ef32505633ad40bd3937edfa739f6b13ecdda599'

2 files changed, 3 insertions, 1 deletions

diff --git a/modules/dns.cpp b/modules/dns.cpp
index 62659414a..d717d53b1 100644
--- a/modules/dns.cpp
+++ b/modules/dns.cpp
@@ -862,6 +862,9 @@ class MyManager : public Manager, public Timer
 				}
 			}
 
+			if (packet->answers.empty() && packet->authorities.empty() && packet->additional.empty() && packet->error == ERROR_NONE)
+				packet->error = ERROR_REFUSED; // usually safe, won't cause an NXDOMAIN to get cached
+
 			s->Reply(packet);
 			return true;
 		}
diff --git a/modules/operserv/dns.cpp b/modules/operserv/dns.cpp
index 2968ba190..1fafb0745 100644
--- a/modules/operserv/dns.cpp
+++ b/modules/operserv/dns.cpp
@@ -1047,7 +1047,6 @@ class ModuleDNS : public Module
 			if (packet->answers.size() == answer_size)
 			{
 				logger.Log("Error! There are no servers with any IPs of type {0}", q.type);
-				/* Send back an empty answer anyway */
 			}
 		}
 	}