|
 |
1ae9b3 |
From d48ffab0a49db8c937bbd62b0b8b755b3dbca4a8 Mon Sep 17 00:00:00 2001
|
|
|
1ae9b3 |
From: Eric Garver <eric@garver.life>
|
|
|
1ae9b3 |
Date: Tue, 23 Jun 2020 13:39:49 -0400
|
|
|
1ae9b3 |
Subject: [PATCH 32/45] docs: replace occurrences of the term blacklist with
|
|
|
1ae9b3 |
denylist
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
(cherry picked from commit af3f7cd074f737c584a42cf1028f18e6fa597204)
|
|
|
1ae9b3 |
(cherry picked from commit 621916b2dbb4cb04da4a0babc3b741202fd709b4)
|
|
|
1ae9b3 |
---
|
|
|
1ae9b3 |
doc/xml/firewalld.direct.xml | 12 ++++++------
|
|
|
1ae9b3 |
src/firewall-config.glade | 2 +-
|
|
|
1ae9b3 |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
diff --git a/doc/xml/firewalld.direct.xml b/doc/xml/firewalld.direct.xml
|
|
|
1ae9b3 |
index de7b5973dd7f..d65b66f74513 100644
|
|
|
1ae9b3 |
--- a/doc/xml/firewalld.direct.xml
|
|
|
1ae9b3 |
+++ b/doc/xml/firewalld.direct.xml
|
|
|
1ae9b3 |
@@ -273,16 +273,16 @@
|
|
|
1ae9b3 |
<title>Example</title>
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
<para>
|
|
|
1ae9b3 |
- Blacklisting of the networks 192.168.1.0/24 and 192.168.5.0/24 with logging and dropping early in the raw table:
|
|
|
1ae9b3 |
+ Denylisting of the networks 192.168.1.0/24 and 192.168.5.0/24 with logging and dropping early in the raw table:
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
<programlisting>
|
|
|
1ae9b3 |
<?xml version="1.0" encoding="utf-8"?>
|
|
|
1ae9b3 |
<direct>
|
|
|
1ae9b3 |
- <chain ipv="ipv4" table="raw" chain="blacklist"/>
|
|
|
1ae9b3 |
- <rule ipv="ipv4" table="raw" chain="PREROUTING" priority="0">-s 192.168.1.0/24 -j blacklist</rule>
|
|
|
1ae9b3 |
- <rule ipv="ipv4" table="raw" chain="PREROUTING" priority="1">-s 192.168.5.0/24 -j blacklist</rule>
|
|
|
1ae9b3 |
- <rule ipv="ipv4" table="raw" chain="blacklist" priority="0">-m limit --limit 1/min -j LOG --log-prefix "blacklisted: "</rule>
|
|
|
1ae9b3 |
- <rule ipv="ipv4" table="raw" chain="blacklist" priority="1">-j DROP</rule>
|
|
|
1ae9b3 |
+ <chain ipv="ipv4" table="raw" chain="denylist"/>
|
|
|
1ae9b3 |
+ <rule ipv="ipv4" table="raw" chain="PREROUTING" priority="0">-s 192.168.1.0/24 -j denylist</rule>
|
|
|
1ae9b3 |
+ <rule ipv="ipv4" table="raw" chain="PREROUTING" priority="1">-s 192.168.5.0/24 -j denylist</rule>
|
|
|
1ae9b3 |
+ <rule ipv="ipv4" table="raw" chain="denylist" priority="0">-m limit --limit 1/min -j LOG --log-prefix "denylisted: "</rule>
|
|
|
1ae9b3 |
+ <rule ipv="ipv4" table="raw" chain="denylist" priority="1">-j DROP</rule>
|
|
|
1ae9b3 |
</direct>
|
|
|
1ae9b3 |
</programlisting>
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
diff --git a/src/firewall-config.glade b/src/firewall-config.glade
|
|
|
1ae9b3 |
index 689433c47eca..6c057f66f401 100644
|
|
|
1ae9b3 |
--- a/src/firewall-config.glade
|
|
|
1ae9b3 |
+++ b/src/firewall-config.glade
|
|
|
1ae9b3 |
@@ -9761,7 +9761,7 @@
|
|
|
1ae9b3 |
<object class="GtkLabel" id="label38">
|
|
|
1ae9b3 |
<property name="can_focus">False</property>
|
|
|
1ae9b3 |
<property name="halign">start</property>
|
|
|
1ae9b3 |
- <property name="label" translatable="yes">For host or network white or blacklisting deactivate the element.</property>
|
|
|
1ae9b3 |
+ <property name="label" translatable="yes">For host or network allow or denylisting deactivate the element.</property>
|
|
|
1ae9b3 |
<property name="wrap">True</property>
|
|
|
1ae9b3 |
<property name="xalign">0</property>
|
|
|
1ae9b3 |
<property name="yalign">0</property>
|
|
|
1ae9b3 |
--
|
|
|
1ae9b3 |
2.27.0
|
|
|
1ae9b3 |
|