This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 51cf3f8be548e3bb3bff19bab7c27dbb56e6e426 (commit) via f98bb538e59279bb0768a15fc7d95267f4d61c74 (commit) from c0ce920610c15e9a3639dbaadb29feea1747ac34 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 51cf3f8be548e3bb3bff19bab7c27dbb56e6e426 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 21 13:39:03 2014 +0100

firewall: rules.pl: Honour time constraints for NAT rules as well.

commit f98bb538e59279bb0768a15fc7d95267f4d61c74 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 21 13:33:08 2014 +0100

firewall: rules.pl: Catch invalid configurations.

-----------------------------------------------------------------------

Summary of changes: config/firewall/rules.pl | 6 ++++++ 1 file changed, 6 insertions(+)

Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index d9c9b5c..f25983c 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -322,6 +322,7 @@ sub buildrules { } push(@nat_options, @source_options); push(@nat_options, ("-d", $nat_address)); + push(@nat_options, @time_options);

my $dnat_port; if ($protocol_has_ports) { @@ -337,6 +338,11 @@ sub buildrules {

# Use iptables DNAT } else { + if ($destination_is_firewall && !$destination) { + $destination = &fwlib::get_external_address(); + } + next unless ($destination); + my ($dnat_address, $dnat_mask) = split("/", $destination); @destination_options = ("-d", $dnat_address);

hooks/post-receive -- IPFire 2.x development tree