From fefb237c5891a14b1c8bc314d2ac112ffbd8f4b4 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 13 Apr 2018 11:19:55 +0200
Subject: [PATCH] ixfrdist: reverse no source and ACL checks

---
 pdns/ixfrdist.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index 5285bf5089..e9e7c2f910 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -531,13 +531,13 @@ void handleUDPRequest(int fd, boost::any&) {
     return;
   }
 
-  if (!allowedByACL(saddr)) {
-    g_log<<Logger::Warning<<"UDP query from "<<saddr.toString()<<" is not allowed, dropping"<<endl;
+  if (saddr == ComboAddress("0.0.0.0", 0)) {
+    g_log<<Logger::Warning<<"Could not determine source of message"<<endl;
     return;
   }
 
-  if (saddr == ComboAddress("0.0.0.0", 0)) {
-    g_log<<Logger::Warning<<"Could not determine source of message"<<endl;
+  if (!allowedByACL(saddr)) {
+    g_log<<Logger::Warning<<"UDP query from "<<saddr.toString()<<" is not allowed, dropping"<<endl;
     return;
   }
 
@@ -578,14 +578,14 @@ void handleTCPRequest(int fd, boost::any&) {
     return;
   }
 
-  if (!allowedByACL(saddr)) {
-    g_log<<Logger::Warning<<"TCP query from "<<saddr.toString()<<" is not allowed, dropping"<<endl;
-    close(cfd);
+  if (saddr == ComboAddress("0.0.0.0", 0)) {
+    g_log<<Logger::Warning<<"Could not determine source of message"<<endl;
     return;
   }
 
-  if (saddr == ComboAddress("0.0.0.0", 0)) {
-    g_log<<Logger::Warning<<"Could not determine source of message"<<endl;
+  if (!allowedByACL(saddr)) {
+    g_log<<Logger::Warning<<"TCP query from "<<saddr.toString()<<" is not allowed, dropping"<<endl;
+    close(cfd);
     return;
   }
 
-- 
2.47.2