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.
 79d29f0082a0f97313c4cf8ec2696281785069bb
Date: Wed, 28 Nov 2012 22:59:42 +0100
Message-ID: <20121128215942.7F92E20263@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4287691835443739417=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============4287691835443739417==
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  79d29f0082a0f97313c4cf8ec2696281785069bb (commit)
       via  4cdf8b927a0e75e7046c315788bba4c3fcbc7df6 (commit)
      from  7eb378428b21cc2dcaeee2d585da6be8950aca8a (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 79d29f0082a0f97313c4cf8ec2696281785069bb
Merge: 7eb3784 4cdf8b9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Nov 28 22:59:33 2012 +0100

    Merge remote-tracking branch 'stevee/next' into next

commit 4cdf8b927a0e75e7046c315788bba4c3fcbc7df6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Nov 28 22:03:44 2012 +0100

    ovpnmain.cgi: Some cosmetic changes on the Net-to-Net section.
   =20
    * Fix colspan of column.
    * Check of mtu-disc and fragment or mssfix, before mtu will be performend.

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

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index cd13a14..f7895a3 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3533,13 +3533,6 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	    goto VPNCONF_ERROR;
     }
=20
-    if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '15=
00')) {
-	$errormessage =3D $Lang::tr{'ovpn mtu-disc and mtu not 1500'};
-	unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAM=
E'}.conf") or die "Removing Configfile fail: $!";
-	rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removi=
ng Directory fail: $!";
-	goto VPNCONF_ERROR;
-    }
-
     if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') {
 	if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) {
 		$errormessage =3D $Lang::tr{'ovpn mtu-disc with mssfix or fragment'};
@@ -3549,6 +3542,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	}
     }
=20
+    if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '15=
00')) {
+	$errormessage =3D $Lang::tr{'ovpn mtu-disc and mtu not 1500'};
+	unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAM=
E'}.conf") or die "Removing Configfile fail: $!";
+	rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removi=
ng Directory fail: $!";
+	goto VPNCONF_ERROR;
+    }
+
     if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'}))  {
 		  $errormessage =3D $Lang::tr{'openvpn prefix local subnet'};
 		  unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'=
NAME'}.conf") or die "Removing Configfile fail: $!";
@@ -4243,7 +4243,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
=20
 	<tr>
 		<td class=3D'boldbase' nowrap=3D'nowrap'>$Lang::tr{'ovpn mtu-disc'}</td>
-		<td colspan=3D'2'>
+		<td colspan=3D'3'>
 			<input type=3D'radio' name=3D'PMTU_DISCOVERY' value=3D'yes' $checked{'PMT=
U_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}
 			<input type=3D'radio' name=3D'PMTU_DISCOVERY' value=3D'maybe' $checked{'P=
MTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}
         		<input type=3D'radio' name=3D'PMTU_DISCOVERY' value=3D'no' $checke=
d{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}


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

--===============4287691835443739417==--