github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #125 from safing/fix/multierror-handling

Browse Source 
Fix multierror handling
This commit is contained in:
Patrick Pacher
2020-08-11 00:16:01 +02:00
committed by GitHub
parent 6ded9b3f8c 2643a90582
commit 0b831e101c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/portmaster-start/recover_linux.go
View File

@@ -48,7 +48,7 @@ var recoverIPTablesCmd = &cobra.Command{
if filteredErrors != nil { if filteredErrors != nil {
filteredErrors.ErrorFormat = formatNfqErrors filteredErrors.ErrorFormat = formatNfqErrors
return filteredErrors return filteredErrors.ErrorOrNil()
} }
return nil return nil

4
firewall/interception/nfqueue_linux.go
View File

@@ -153,7 +153,7 @@ func DeactivateNfqueueFirewall() error {
result = multierror.Append(result, err) result = multierror.Append(result, err)
} }
return result return result.ErrorOrNil()
} }
func activateIPTables(protocol iptables.Protocol, rules, once, chains []string) error { func activateIPTables(protocol iptables.Protocol, rules, once, chains []string) error {
@@ -223,7 +223,7 @@ func deactivateIPTables(protocol iptables.Protocol, rules, chains []string) erro
} }
} }
return multierr return multierr.ErrorOrNil()
} }
// StartNfqueueInterception starts the nfqueue interception. // StartNfqueueInterception starts the nfqueue interception.