Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit 4f0296fdf3764473647cb6c02bb92e0c2d0cfd35
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Wed Aug 20 13:34:30 2014 +0200
Fix get/setDefaultZoneName
---------------------------------------------------------------
firewall.cpp | 6 +++---
firewall.hpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/firewall.cpp b/firewall.cpp
index c8a1618..55ce4a2 100644
--- a/firewall.cpp
+++ b/firewall.cpp
@@ -33,7 +33,7 @@ namespace firewalld
addZoneName("trusted");
addZoneName("drop");
// Initialize the default zone name
- _default_zone = NULL;
+ _default_zone = "public";
addInterfaceToZone("public", "eth0");
}
@@ -200,13 +200,13 @@ namespace firewalld
const UString& Firewall::getDefaultZoneName()
{
Glib::Threads::Mutex::Lock lock(_mutex);
- return "public";
+ return _default_zone;
}
bool Firewall::setDefaultZoneName(const UString& name)
{
Glib::Threads::Mutex::Lock lock(_mutex);
- _default_zone = NULL;
+ _default_zone = name;
return true;
}
diff --git a/firewall.hpp b/firewall.hpp
index 61ef45a..522cb5b 100644
--- a/firewall.hpp
+++ b/firewall.hpp
@@ -91,7 +91,7 @@ namespace firewalld
private:
Glib::Threads::Mutex _mutex;
- Zone* _default_zone;
+ UString _default_zone;
UStringKeyMap<Zone*> _zone_map;
IP4Tables _ip4tables;