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, master has been updated via 499e7fc33fe5b689476d8bdaf4452f5163b20f22 (commit) via 7bfaaa0d353ffefd50b2d4bbfa70a81363669d62 (commit) via 9f64c06d941709052d2ae7405a3770b018a6e192 (commit) from 35880220b07a87b57689e21ac2fd514c50fc81f4 (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 499e7fc33fe5b689476d8bdaf4452f5163b20f22 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 6 18:44:50 2014 +0200

general-functions.pl: Fix perl coding error

commit 7bfaaa0d353ffefd50b2d4bbfa70a81363669d62 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 4 11:13:41 2014 +0200

general-functions.pl: Fix syntax error

commit 9f64c06d941709052d2ae7405a3770b018a6e192 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 3 22:23:04 2014 +0200

general-functions.pl: Subroutine getnetworkip() accepted multiple arguments

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

Summary of changes: config/cfgroot/general-functions.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 8ed87fc..35ae7c0 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -286,7 +286,7 @@ sub validip sub validmask { my $mask = shift;

- return &Network::check_netmask($mask) or &Network::check_prefix($mask); + return &Network::check_netmask($mask) || &Network::check_prefix($mask); }

sub validipormask @@ -388,7 +388,9 @@ sub iporsubtocidr }

sub getnetworkip { - return &Network::get_netaddress(shift); + my $arg = join("/", @_); + + return &Network::get_netaddress($arg); }

sub getccdbc

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