From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 22 Nov 2012 18:45:44 +0000 (+0100)
Subject: Revert "openvpn.cgi: Respect if mtu-disc hasn't been configured yet."
X-Git-Tag: v2.11-core65~1^2~31^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2621c3190fa9f3a818a7a9b3eb1e6ff5ae6d38f;p=ipfire-2.x.git

Revert "openvpn.cgi: Respect if mtu-disc hasn't been configured yet."

This reverts commit a66e24bbfd09b2ab2345ece2079d7143348a3980.
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 9ae2a5f5ca..0fadbd7ab3 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -357,7 +357,7 @@ sub writeserverconf {
 	{ print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; }
     elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') 
 	{ print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; }
-    elsif (($sovpnsettings{'PMTU_DISCOVERY'} ne 'off') || ($sovpnsettings{'PMTU_DISCOVERY'} ne ''))
+    elsif ($sovpnsettings{'PMTU_DISCOVERY'} ne 'off')
 	{ print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } 
     else 
 	{ print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n"; }
@@ -398,7 +398,7 @@ sub writeserverconf {
 	print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";   
     }
 
-    if (($sovpnsettings{PMTU_DISCOVERY} ne 'off') || ($sovpnsettings{'PMTU_DISCOVERY'} ne '')) {
+    if ($sovpnsettings{PMTU_DISCOVERY} ne 'off') {
 	print CONF "mtu-disc $sovpnsettings{'PMTU_DISCOVERY'}\n";
     }
 
@@ -1004,7 +1004,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} 
   if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; 
   }
-  if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') || ($cgiparams{'PMTU_DISCOVERY'} ne '')) {
+  if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') {
 	if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) {
 		if($cgiparams{'MTU'} eq '1500') {
 			print SERVERCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n";
@@ -1089,7 +1089,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";}
   if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; 
   }
-   if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') || ($cgiparams{'PMTU_DISCOVERY'} ne '')) {
+   if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') {
         if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) {
 		if ($cgiparams{'MTU'} eq '1500') {
                 	print CLIENTCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n";
@@ -2096,7 +2096,7 @@ else
 	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
     elsif ($vpnsettings{MSSFIX} eq 'on')
 	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
-    elsif (($vpnsettings{PMTU_DISCOVERY} ne 'off') || ($cgiparams{'PMTU_DISCOVERY'} ne ''))
+    elsif ($vpnsettings{PMTU_DISCOVERY} ne 'off')
 	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
     else
 	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; }
@@ -2144,7 +2144,7 @@ else
     if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) {
 	print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n";
     }
-    if (($vpnsettings{PMTU_DISCOVERY} ne 'off') || ($cgiparams{'PMTU_DISCOVERY'} ne '')) {
+    if ($vpnsettings{PMTU_DISCOVERY} ne 'off') {
 	if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) {
 		print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\n";
 	}