[git.ipfire.org] IPFire 2.x development tree branch, core65, updated. 2979567e9b89680222b9f51efe9828d20c9d86ff

[git.ipfire.org] IPFire 2.x development tree branch, core65, updated. 2979567e9b89680222b9f51efe9828d20c9d86ff

[git]

[-- Attachment #1: Type: text/plain, Size: 2848 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, core65 has been updated
       via  2979567e9b89680222b9f51efe9828d20c9d86ff (commit)
       via  4f6e3ae3b8768819b2fc9807d17a1c4e04e7478e (commit)
      from  220c93308985f3e3df4d689a08cf17359f9fb35b (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 2979567e9b89680222b9f51efe9828d20c9d86ff
Merge: 220c933 4f6e3ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Dec 17 22:09:30 2012 +0100

    Merge branch 'master' into core65

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

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

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 2b0c4ba..6def979 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2101,20 +2101,20 @@ else
     print CLIENTCONF "#OpenVPN Client conf\r\n";
     print CLIENTCONF "tls-client\r\n";
     print CLIENTCONF "client\r\n";
-    print CLIENTCONF "nobind\n";
+    print CLIENTCONF "nobind\r\n";
     print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n";
     print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n";
 
     # Check if we are using fragment, mssfix or mtu-disc and set MTU to 1500
     # or use configured value.
     if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' )
-	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
+	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; }
     elsif ($vpnsettings{MSSFIX} eq 'on')
-	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
+	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; }
     elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') ||
            ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') ||
            ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) 
-	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; }
+	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\r\n"; }
     else
 	{ print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; }
 
@@ -2167,7 +2167,7 @@ else
         ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') ||
         ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) {
 	if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) {
-		print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\n";
+		print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n";
 	}
     }
     close(CLIENTCONF);


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