Repository : http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
commit a8585db942f5b15140e0206ed0bed6af70a21962 Author: Daniel Kopecek dkopecek@redhat.com Date: Fri Dec 5 11:24:45 2014 +0100
Make the changeZone D-Bus method deprecated
src/Daemon/DBus/zone/changeZone.cpp | 27 ++------------------------- 1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/Daemon/DBus/zone/changeZone.cpp b/src/Daemon/DBus/zone/changeZone.cpp index f9905a3..0274627 100644 --- a/src/Daemon/DBus/zone/changeZone.cpp +++ b/src/Daemon/DBus/zone/changeZone.cpp @@ -24,31 +24,8 @@ namespace firewalld { FIREWALLD_DBUS_METHOD(1,zone,changeZone) { - result.setTypeSignature("(s)"); - - UString zone_name; - UString interface_identifier; - - parameters.get(0, zone_name); - parameters.get(1, interface_identifier); - - try { - Pointer<Zone> zone_new = _fw.getWritableZone(zone_name.empty() ? - _fw.getDefaultZoneName() : zone_name); - Pointer<Interface> interface = _fw.getInterface(interface_identifier); - Pointer<Zone> zone_cur = interface->getZone(); - - zone_cur->removeInterface(interface); - zone_new->addInterface(interface); - - _dbus.broadcastSignal("ZoneOfInterfaceChanged", DBUS_INTERFACE_ZONE, parameters); - - result = zone_new->name(); - } - catch(const FirewallError& ex) { - result = DBusError(ex); - } - + result = DBusError("Deprecated", + "The changeZone method is deprecated. Use changeZoneOfInterface instead."); return; } } /* namespace firewalld */