From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7eb378428b21cc2dcaeee2d585da6be8950aca8a
Date: Wed, 28 Nov 2012 22:14:33 +0100 [thread overview]
Message-ID: <20121128211433.73C6020263@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2769 bytes --]
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 7eb378428b21cc2dcaeee2d585da6be8950aca8a (commit)
via f4819f1f76c38963382b5f9bb052a8fc366432d5 (commit)
via f7fc17c38a0338a0c09e03ee34edb7823d398483 (commit)
from bd54ff030eee920be813de64e8b4ffec8d57315b (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 7eb378428b21cc2dcaeee2d585da6be8950aca8a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 28 22:13:17 2012 +0100
core 65: Ship vpnmain.cgi.
commit f4819f1f76c38963382b5f9bb052a8fc366432d5
Merge: bd54ff0 f7fc17c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 28 22:12:50 2012 +0100
Merge remote-tracking branch 'amarx/ipsec' into next
commit f7fc17c38a0338a0c09e03ee34edb7823d398483
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Mon Nov 26 13:19:07 2012 +0100
IPSEC: added checkroutine for used OpenVPN subnets/Hosts
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/65/filelists/files | 1 +
html/cgi-bin/vpnmain.cgi | 8 ++++++++
2 files changed, 9 insertions(+)
mode change 100644 => 100755 html/cgi-bin/vpnmain.cgi
Difference in files:
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 297f276..91272a4 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -3,6 +3,7 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/ovpn-ccd-convert
var/ipfire/general-functions.pl
var/ipfire/langs
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
old mode 100644
new mode 100755
index 0fb7c93..24aeb6d
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1415,6 +1415,14 @@ END
goto VPNCONF_ERROR;
}
+
+ if ($cgiparams{'TYPE'} eq 'net'){
+ $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
+ if ($errormessage ne ''){
+ goto VPNCONF_ERROR;
+ }
+
+ }
if ($cgiparams{'AUTH'} eq 'psk') {
if (! length($cgiparams{'PSK'}) ) {
$errormessage = $Lang::tr{'pre-shared key is too short'};
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-11-28 21:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121128211433.73C6020263@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox