From 2c720617af5ccdc89e1297a54b5b40ae60506dbb Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Thu, 20 Mar 2014 13:28:20 -0600 Subject: [PATCH 4/5] Use standard D-Bus capitalization everywhere --- doc/xml/firewalld.xml | 4 ++-- doc/xml/firewalld.zones.xml | 2 +- firewalld.spec | 4 ++-- src/firewall/dbus_utils.py | 2 +- src/firewall/server/decorators.py | 4 ++-- src/firewall/server/server.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/xml/firewalld.xml b/doc/xml/firewalld.xml index c34f5ea..4ccf4e3 100644 --- a/doc/xml/firewalld.xml +++ b/doc/xml/firewalld.xml @@ -117,7 +117,7 @@ Concepts - firewalld has a D-BUS interface for firewall configuration of services and applications. It also has a command line client for the user. Services or applications already using D-BUS can request changes to the firewall with the D-BUS interface directly. For more information on the firewalld D-BUS interface, please have a look at firewalld.dbus5. + firewalld has a D-Bus interface for firewall configuration of services and applications. It also has a command line client for the user. Services or applications already using D-Bus can request changes to the firewall with the D-Bus interface directly. For more information on the firewalld D-Bus interface, please have a look at firewalld.dbus5. firewalld provides support for zones, predefined services and ICMP types and has a separation of runtime and permanent configuration options. Permanent configuration is loaded from XML files in /usr/lib/firewalld or /etc/firewalld (see ). @@ -164,7 +164,7 @@ Direct interface - The direct interface is mainly used by services or applications to add specific firewall rules. The rules are not permanent and need to get applied after receiving the , or message from firewalld using D-BUS. + The direct interface is mainly used by services or applications to add specific firewall rules. The rules are not permanent and need to get applied after receiving the , or message from firewalld using D-Bus. diff --git a/doc/xml/firewalld.zones.xml b/doc/xml/firewalld.zones.xml index 8451933..fe2be6e 100644 --- a/doc/xml/firewalld.zones.xml +++ b/doc/xml/firewalld.zones.xml @@ -210,7 +210,7 @@ How to configure or add zones? - To configure or add zones you can either use one of the firewalld interfaces to handle and change the configuration: These are the graphical configuration tool firewall-config, the command line tool firewall-cmd or the D-BUS interface. Or you can create or copy a zone file in one of the configuration directories. /lib/firewalld/zones is used for default and fallback configurations and /firewalld/zones is used for user created and customized configuration files. + To configure or add zones you can either use one of the firewalld interfaces to handle and change the configuration: These are the graphical configuration tool firewall-config, the command line tool firewall-cmd or the D-Bus interface. Or you can create or copy a zone file in one of the configuration directories. /lib/firewalld/zones is used for default and fallback configurations and /firewalld/zones is used for user created and customized configuration files. diff --git a/firewalld.spec b/firewalld.spec index 9a6644c..3e6d22b 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,4 +1,4 @@ -Summary: A firewall daemon with D-BUS interface providing a dynamic firewall +Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 0.3.9.3 Release: 1%{?dist} @@ -24,7 +24,7 @@ Requires(postun): systemd %description firewalld is a firewall service daemon that provides a dynamic customizable -firewall with a D-BUS interface. +firewall with a D-Bus interface. %package -n firewall-applet Summary: Firewall panel applet diff --git a/src/firewall/dbus_utils.py b/src/firewall/dbus_utils.py index af83401..72075c3 100644 --- a/src/firewall/dbus_utils.py +++ b/src/firewall/dbus_utils.py @@ -84,7 +84,7 @@ def context_of_sender(bus, sender): return "".join(map(chr, dbus_to_python(context))) def command_of_sender(bus, sender): - """ Return command of D-BUS sender """ + """ Return command of D-Bus sender """ return command_of_pid(pid_of_sender(bus, sender)) diff --git a/src/firewall/server/decorators.py b/src/firewall/server/decorators.py index 457d43a..4b2d726 100644 --- a/src/firewall/server/decorators.py +++ b/src/firewall/server/decorators.py @@ -34,7 +34,7 @@ from firewall.errors import * @decorator def handle_exceptions(func, *args, **kwargs): """Decorator to handle exceptions and log them. Used if not conneced - to D-BUS. + to D-Bus. """ try: return func(*args, **kwargs) @@ -45,7 +45,7 @@ def handle_exceptions(func, *args, **kwargs): @decorator def dbus_handle_exceptions(func, *args, **kwargs): - """Decorator to handle exceptions, log and report them into D-BUS + """Decorator to handle exceptions, log and report them into D-Bus :Raises DBusException: on a firewall error code problems. """ diff --git a/src/firewall/server/server.py b/src/firewall/server/server.py index f4263ae..c90c87d 100644 --- a/src/firewall/server/server.py +++ b/src/firewall/server/server.py @@ -60,7 +60,7 @@ def sigterm(mainloop): ############################################################################ def run_server(debug_gc=False): - """ Main function for firewall server. Handles D-BUS and GLib mainloop. + """ Main function for firewall server. Handles D-Bus and GLib mainloop. """ service = None if debug_gc: -- 1.8.5.3