Fix multierror handling

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
cmds/portmaster-start
firewall/interception

View file

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

View file

@ -153,7 +153,7 @@ func DeactivateNfqueueFirewall() error {
result = multierror.Append(result, err)
}
return result
return result.ErrorOrNil()
}
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.