Merge pull request #2450 from TheNodi/iptables-policy

Always configure iptables forward policy
This commit is contained in:
Euan Harris 2019-09-17 16:38:09 +01:00 committed by GitHub
commit 141b53c77a
1 changed files with 5 additions and 5 deletions

View File

@ -34,11 +34,11 @@ func setupIPForwarding(enableIPTables bool) error {
if err := configureIPForwarding(true); err != nil {
return fmt.Errorf("Enabling IP forwarding failed: %v", err)
}
// When enabling ip_forward set the default policy on forward chain to
// drop only if the daemon option iptables is not set to false.
if !enableIPTables {
return nil
}
}
// Set the default policy on forward chain to drop only if the
// daemon option iptables is not set to false.
if enableIPTables {
if err := iptables.SetDefaultPolicy(iptables.Filter, "FORWARD", iptables.Drop); err != nil {
if err := configureIPForwarding(false); err != nil {
logrus.Errorf("Disabling IP forwarding failed, %v", err)