|
 |
7548c0 |
From 15b1f63574db2100d433d283a975928f83bb0ecb Mon Sep 17 00:00:00 2001
|
|
|
7548c0 |
Message-Id: <15b1f63574db2100d433d283a975928f83bb0ecb@dist-git>
|
|
|
7548c0 |
From: Laine Stump <laine@redhat.com>
|
|
|
7548c0 |
Date: Fri, 15 Jan 2021 22:51:44 -0500
|
|
|
7548c0 |
Subject: [PATCH] util: fix typo in VIR_MOCK_WRAP_RET_ARGS()
|
|
|
7548c0 |
|
|
|
7548c0 |
When virfirewalltest.c was first written in commit 3a0ca7de51 (March
|
|
|
7548c0 |
2013), a conditional accidentally tested for "ipv4" instead of
|
|
|
7548c0 |
"ipv6". Since the file ended up only testing ipv4 rules, this has
|
|
|
7548c0 |
never made any difference in practice, but I'm making some other
|
|
|
7548c0 |
changes in this file and just couldn't let it stand :-)
|
|
|
7548c0 |
|
|
|
7548c0 |
https://bugzilla.redhat.com/1607929
|
|
|
7548c0 |
|
|
|
7548c0 |
Signed-off-by: Laine Stump <laine@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
7548c0 |
(cherry picked from commit 28a3deddddfe102b37f2e373bf4581c2ce8d2050)
|
|
|
7548c0 |
Message-Id: <20210116035151.1066734-2-laine@redhat.com>
|
|
|
7548c0 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7548c0 |
---
|
|
|
7548c0 |
tests/virfirewalltest.c | 2 +-
|
|
|
7548c0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7548c0 |
|
|
|
7548c0 |
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
|
|
|
7548c0 |
index c4827918c3..8aba127610 100644
|
|
|
7548c0 |
--- a/tests/virfirewalltest.c
|
|
|
7548c0 |
+++ b/tests/virfirewalltest.c
|
|
|
7548c0 |
@@ -129,7 +129,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block,
|
|
|
7548c0 |
if (fwBuf) {
|
|
|
7548c0 |
if (STREQ(type, "ipv4"))
|
|
|
7548c0 |
virBufferAddLit(fwBuf, IPTABLES_PATH);
|
|
|
7548c0 |
- else if (STREQ(type, "ipv4"))
|
|
|
7548c0 |
+ else if (STREQ(type, "ipv6"))
|
|
|
7548c0 |
virBufferAddLit(fwBuf, IP6TABLES_PATH);
|
|
|
7548c0 |
else
|
|
|
7548c0 |
virBufferAddLit(fwBuf, EBTABLES_PATH);
|
|
|
7548c0 |
--
|
|
|
7548c0 |
2.30.0
|
|
|
7548c0 |
|