You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseAC...

25 lines
711 B

--- 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()