diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-05-04 15:58:27 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-05-04 15:59:32 +0200 |
| commit | 2f423a8e9ed32494f7811dcf7d73e637cce23e46 (patch) | |
| tree | 3be95c280df3e3ecb1da5799632cf03c927a433c | |
| parent | 8232c3473f93a87e2eb736bf4b63049001a20926 (diff) | |
| download | NetworkManager-2f423a8e9ed32494f7811dcf7d73e637cce23e46.tar.gz | |
firewall: rename "nm-firewall-manager.[ch]" to "nm-firewalld-manager.[ch]"
We will add a general "firewall-manager", so rename the firewalld related
file. This commit only renames the file. The next commit will change the
symbol naming.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/core/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/core/meson.build | 2 | ||||
| -rw-r--r-- | src/core/nm-firewalld-manager.c (renamed from src/core/nm-firewall-manager.c) | 2 | ||||
| -rw-r--r-- | src/core/nm-firewalld-manager.h (renamed from src/core/nm-firewall-manager.h) | 0 | ||||
| -rw-r--r-- | src/core/nm-policy.c | 2 | ||||
| -rw-r--r-- | src/core/vpn/nm-vpn-connection.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 1f74709ffc..49a4db3ee2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2567,8 +2567,8 @@ src_core_libNetworkManager_la_SOURCES = \ src/core/nm-dhcp-config.h \ src/core/nm-dispatcher.c \ src/core/nm-dispatcher.h \ - src/core/nm-firewall-manager.c \ - src/core/nm-firewall-manager.h \ + src/core/nm-firewalld-manager.c \ + src/core/nm-firewalld-manager.h \ src/core/nm-proxy-config.c \ src/core/nm-proxy-config.h \ src/core/nm-auth-manager.c \ diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 0aa0d3c7dc..04d5e87b84 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -52,7 +52,7 @@ #include "dnsmasq/nm-dnsmasq-manager.h" #include "nm-dhcp-config.h" #include "nm-rfkill-manager.h" -#include "nm-firewall-manager.h" +#include "nm-firewalld-manager.h" #include "settings/nm-settings-connection.h" #include "settings/nm-settings.h" #include "nm-setting-ethtool.h" diff --git a/src/core/meson.build b/src/core/meson.build index 9552f7de81..9758637235 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -162,7 +162,7 @@ libNetworkManager = static_library( 'nm-dcb.c', 'nm-dhcp-config.c', 'nm-dispatcher.c', - 'nm-firewall-manager.c', + 'nm-firewalld-manager.c', 'nm-hostname-manager.c', 'nm-keep-alive.c', 'nm-manager.c', diff --git a/src/core/nm-firewall-manager.c b/src/core/nm-firewalld-manager.c index 0db6fb4bbc..5a018728e8 100644 --- a/src/core/nm-firewall-manager.c +++ b/src/core/nm-firewalld-manager.c @@ -5,7 +5,7 @@ #include "src/core/nm-default-daemon.h" -#include "nm-firewall-manager.h" +#include "nm-firewalld-manager.h" #include "libnm-glib-aux/nm-dbus-aux.h" #include "c-list/src/c-list.h" diff --git a/src/core/nm-firewall-manager.h b/src/core/nm-firewalld-manager.h index 1ce802b2cd..1ce802b2cd 100644 --- a/src/core/nm-firewall-manager.h +++ b/src/core/nm-firewalld-manager.h diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 52d9b34e0c..ccd00e1ad5 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -21,7 +21,7 @@ #include "dns/nm-dns-manager.h" #include "vpn/nm-vpn-manager.h" #include "nm-auth-utils.h" -#include "nm-firewall-manager.h" +#include "nm-firewalld-manager.h" #include "nm-dispatcher.h" #include "nm-utils.h" #include "libnm-core-intern/nm-core-internal.h" diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c index 2dbbae9105..4618694576 100644 --- a/src/core/vpn/nm-vpn-connection.c +++ b/src/core/vpn/nm-vpn-connection.c @@ -29,7 +29,7 @@ #include "settings/nm-agent-manager.h" #include "libnm-core-intern/nm-core-internal.h" #include "nm-pacrunner-manager.h" -#include "nm-firewall-manager.h" +#include "nm-firewalld-manager.h" #include "nm-config.h" #include "nm-vpn-plugin-info.h" #include "nm-vpn-manager.h" |