From mboxrd@z Thu Jan 1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
6a2a62cf25bc486c854715d06154b7e500396dd2
Date: Wed, 03 Sep 2014 22:25:07 +0200
Message-ID: <20140903202508.1ED4521259@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5195768557256260226=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============5195768557256260226==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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 6a2a62cf25bc486c854715d06154b7e500396dd2 (commit)
from bd76bcb8b48d37a7aa9835b277cd9970ddb06502 (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 6a2a62cf25bc486c854715d06154b7e500396dd2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Sep 3 22:23:04 2014 +0200
general-functions.pl: Subroutine getnetworkip() accepted multiple argumen=
ts
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun=
ctions.pl
index 8ed87fc..7c88cfc 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -388,7 +388,9 @@ sub iporsubtocidr
}
=20
sub getnetworkip {
- return &Network::get_netaddress(shift);
+ my $arg =3D join("/", $@);
+
+ return &Network::get_netaddress($arg);
}
=20
sub getccdbc
hooks/post-receive
--
IPFire 2.x development tree
--===============5195768557256260226==--