Blame SOURCES/remove-existsErr-workaround.patch
|
 |
9a23a6 |
commit a5f18ede385f8f348d876635c8483640d6446d65
|
|
|
9a23a6 |
Author: Michael Cambria <mcambria@redhat.com>
|
|
|
9a23a6 |
Date: Mon Jun 24 16:11:51 2019 -0400
|
|
|
9a23a6 |
|
|
|
9a23a6 |
Remove iptables mode dependent existsErr code work-around.
|
|
|
9a23a6 |
iptables fixed in iptables-1.8.1
|
|
|
9a23a6 |
commit c19fa5833a0bc0eb787799634bd26dea91fcdca1
|
|
|
9a23a6 |
|
|
|
9a23a6 |
diff -up plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go.orig plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go
|
|
|
9a23a6 |
--- plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go.orig 2019-05-29 18:30:15.000000000 +0200
|
|
|
9a23a6 |
+++ plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go 2019-07-31 09:24:30.070738570 +0200
|
|
|
9a23a6 |
@@ -302,18 +302,13 @@ func (ipt *IPTables) NewChain(table, cha
|
|
|
9a23a6 |
return ipt.run("-t", table, "-N", chain)
|
|
|
9a23a6 |
}
|
|
|
9a23a6 |
|
|
|
9a23a6 |
+const existsErr = 1
|
|
|
9a23a6 |
+
|
|
|
9a23a6 |
// ClearChain flushed (deletes all rules) in the specified table/chain.
|
|
|
9a23a6 |
// If the chain does not exist, a new one will be created
|
|
|
9a23a6 |
func (ipt *IPTables) ClearChain(table, chain string) error {
|
|
|
9a23a6 |
err := ipt.NewChain(table, chain)
|
|
|
9a23a6 |
|
|
|
9a23a6 |
- // the exit code for "this table already exists" is different for
|
|
|
9a23a6 |
- // different iptables modes
|
|
|
9a23a6 |
- existsErr := 1
|
|
|
9a23a6 |
- if ipt.mode == "nf_tables" {
|
|
|
9a23a6 |
- existsErr = 4
|
|
|
9a23a6 |
- }
|
|
|
9a23a6 |
-
|
|
|
9a23a6 |
eerr, eok := err.(*Error)
|
|
|
9a23a6 |
switch {
|
|
|
9a23a6 |
case err == nil:
|