public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ffeaaef6182adc81f01684a98cd1f5975d22b4be
Date: Sat, 12 Dec 2015 10:51:01 +0100	[thread overview]
Message-ID: <20151212095101.613462143E@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2144 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  ffeaaef6182adc81f01684a98cd1f5975d22b4be (commit)
      from  ea6fa9de5afc5a0d0b258ff08fe7bfbc0c6dbb30 (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 ffeaaef6182adc81f01684a98cd1f5975d22b4be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Dec 12 09:50:19 2015 +0000

    connections.cgi: Fix page crash with IPsec connections with one subnet only
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/96/filelists/files | 1 +
 html/cgi-bin/connections.cgi             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files
index e1681cb..0eb5b56 100644
--- a/config/rootfiles/core/96/filelists/files
+++ b/config/rootfiles/core/96/filelists/files
@@ -10,6 +10,7 @@ etc/rc.d/rc0.d/K51vnstat
 etc/rc.d/rc3.d/S01vnstat
 etc/rc.d/rc6.d/K51vnstat
 opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/routing.cgi
 usr/sbin/convert-portfw
 var/ipfire/general-functions.pl
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 85a9cd7..96f0901 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -262,7 +262,7 @@ close(IPSEC);
 foreach my $line (@ipsec) {
 	my @vpn = split(',', $line);
 
-	my @subnets = split('|', $vpn[12]);
+	my @subnets = split(/\|/, $vpn[12]);
 	for my $subnet (@subnets) {
 		my ($network, $mask) = split("/", $subnet);
 


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

                 reply	other threads:[~2015-12-12  9:51 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=20151212095101.613462143E@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