From 4592262b9107143ce292ec51d176e3ab2210c186 Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 14 2020 07:00:39 +0000
Subject: Apply patch 0037-fix-cli-add-ipset-type-hash-mac-is-incompatible-with.patch


patch_name: 0037-fix-cli-add-ipset-type-hash-mac-is-incompatible-with.patch
present_in_specfile: true
location_in_specfile: 37

---

diff --git a/src/firewall-cmd.in b/src/firewall-cmd.in
index 014f388..b6c2f84 100755
--- a/src/firewall-cmd.in
+++ b/src/firewall-cmd.in
@@ -1074,6 +1074,9 @@ if a.permanent:
         if not a.type:
             cmd.fail(parser.format_usage() + "No type specified.")
 
+        if a.type=='hash:mac' and a.family:
+            cmd.fail(parser.format_usage()+ "--family is not compatible with the hash:mac type")
+
         settings = FirewallClientIPSetSettings()
         settings.setType(a.type)
         if a.option:
diff --git a/src/firewall-offline-cmd.in b/src/firewall-offline-cmd.in
index c0ad9ec..98c0054 100755
--- a/src/firewall-offline-cmd.in
+++ b/src/firewall-offline-cmd.in
@@ -1577,6 +1577,9 @@ try:
         if not a.type:
             cmd.fail(parser.format_usage() + "No type specified.")
 
+        if a.type=='hash:mac' and a.family:
+            cmd.fail(parser.format_usage() + "--family is not compatible with the hash:mac type")
+        
         settings = FirewallClientIPSetSettings()
         settings.setType(a.type)
         if a.option:
diff --git a/src/tests/regression/regression.at b/src/tests/regression/regression.at
index 5241a11..5c8aae7 100644
--- a/src/tests/regression/regression.at
+++ b/src/tests/regression/regression.at
@@ -32,3 +32,4 @@ m4_include([regression/rhbz1829104.at])
 m4_include([regression/rhbz1843398.at])
 m4_include([regression/rhbz1689429.at])
 m4_include([regression/rhbz1483921.at])
+m4_include([regression/rhbz1541077.at])
diff --git a/src/tests/regression/rhbz1541077.at b/src/tests/regression/rhbz1541077.at
new file mode 100644
index 0000000..765ab0c
--- /dev/null
+++ b/src/tests/regression/rhbz1541077.at
@@ -0,0 +1,9 @@
+FWD_START_TEST([hash:mac and family mutually exclusive])
+    AT_KEYWORDS(ipset rhbz1541077)
+
+    FWD_CHECK([firewall-cmd --permanent --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore)
+    
+    FWD_CHECK([firewall-cmd --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore)
+
+    FWD_CHECK([firewall-offline-cmd --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore)
+FWD_END_TEST