vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 19:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix multierror handling

Browse source
This commit is contained in:
Daniel 2020-08-10 23:13:42 +02:00
parent 7ccd0d13bc
commit 2643a90582
2 changed files with 3 additions and 3 deletions
Show stats 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.