Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit 5e09af418cf00da105e5a0ec86408828d33d8316
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Tue Oct 14 10:54:16 2014 +0200
Fixed some overly ambiguous error messages
---------------------------------------------------------------
src/Daemon/Firewall/Firewall.cpp | 9 +--------
src/Daemon/Firewall/Zone.cpp | 6 ++++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/Daemon/Firewall/Firewall.cpp b/src/Daemon/Firewall/Firewall.cpp
index cafc834..fa626c1 100644
--- a/src/Daemon/Firewall/Firewall.cpp
+++ b/src/Daemon/Firewall/Firewall.cpp
@@ -147,17 +147,10 @@ namespace firewalld
{
auto zone_ptr = PointerMapOp::findOne(_zone_map, name);
if (zone_ptr == nullptr) {
- throw FirewallError("INVALID_ZONE", "Zone not defined");
+ throw FirewallError("INVALID_ZONE", "Zone \"" + name +
"\" not defined");
} else {
return zone_ptr;
}
-#if 0
- auto zone_it = _zone_map.find(name);
- if (zone_it == _zone_map.end()) {
- throw FirewallError("INVALID_ZONE", "Zone not defined");
- }
- return zone_it->second;
-#endif
}
void Firewall::getAllZoneNames(UStringVector& names) const
diff --git a/src/Daemon/Firewall/Zone.cpp b/src/Daemon/Firewall/Zone.cpp
index 2b5fb16..1375e59 100644
--- a/src/Daemon/Firewall/Zone.cpp
+++ b/src/Daemon/Firewall/Zone.cpp
@@ -390,7 +390,8 @@ namespace firewalld
const UString& name = attr.at("name");
Pointer<Service> service = FirewallD::instance()->lookupService(name);
if (service == nullptr) {
- throw FirewallError("INVALID_SERVICE", "Unknown service");
+ throw ConfigurationError(_identifier + ".xml",
+ "Referenced service \"" + name + "\" is not
defined");
}
addService(service);
}
@@ -417,7 +418,8 @@ namespace firewalld
const UString& name = attr.at("name");
Pointer<ICMPType> icmptype = FirewallD::instance()->lookupICMPType(name);
if (icmptype == nullptr) {
- throw FirewallError("INVALID_ICMPTYPE", "Unknown ICMP type");
+ throw ConfigurationError(_identifier + ".xml",
+ "Referenced ICMP type \"" + name + "\" is not
defined");
}
addICMPBlock(icmptype);
}