net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

--- a/pdns_recursor.cc
+++ b/pdns_recursor.cc
@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
       result->addMask(line);
     }
     g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl;
-
-    return result;
   }
   else if(!::arg()[aclSetting].empty()) {
     vector<string> ips;
@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
       g_log<<Logger::Info<<*i;
     }
     g_log<<Logger::Info<<endl;
-
-    return result;
   }
 
-  return nullptr;
+  return result;
 }
 
 void parseACLs()