[patch] patch for kvpnc-0.8.1 to get pptp working

kvpnc-0.8.1-gentoo-pppd-mppc.patch (text/plain), 5.29 KB, created by e-spark on 2005-11-10 16:54:41 UTC

--- kvpnc-0.8.1/src/kvpnc.cpp	2005-10-24 18:23:26.000000000 +0200
+++ kvpnc-0.8/src/kvpnc.cpp	2005-11-11 00:33:06.000000000 +0100
@@ -2026,14 +2026,13 @@
 				stream << "" << "\n";
 				stream << "\n";
 				stream << "# name of tunnel, used to select lines in secrets files\n";
-				//stream << "remotename "+GlobalConfig->currentProfile->getName()+"\n";
-				stream << "remotename pptp-server\n";
+				stream << "remotename "+GlobalConfig->currentProfile->getName()+"\n";
 				stream << "\n";
 				stream << "# name of tunnel, used to name /var/run pid file\n";
-				stream << "linkname "+GlobalConfig->currentProfile->getName()+"\n";
+				stream << "linkname kvpnc."+GlobalConfig->currentProfile->getName()+"\n";
 				stream << "\n";
 				stream << "# name of tunnel, passed to ip-up scripts\n";
-				stream << "ipparam "+GlobalConfig->currentProfile->getName()+"\n";
+				stream << "ipparam kvpnc."+GlobalConfig->currentProfile->getName()+"\n";
 				stream << "\n";
 				stream << "# data stream for pppd to use\n";
 				stream << "pty \"pptp "+GlobalConfig->currentProfile->getGateway()+" --nolaunchpppd\"\n";
@@ -2063,37 +2062,29 @@
 
 				if ( GlobalConfig->currentProfile->getRequireMppe())
 				{
-					stream << "# use MPPE compression\n";
+
+
+					stream << "# use MPPE encryption\n";
+					stream << "mppe required";
+
+					if (!GlobalConfig->currentProfile->getAllowStatefulMode())
+						stream << ",stateless";
+
 					if (GlobalConfig->currentProfile->getRefuse128BitEncryption())
-					{
-						stream << "nomppe-128\n";
-						if (GlobalConfig->currentProfile->getRefuse40BitEncryption())
-							stream << "nomppe-40\n";
-						else
-						{
-							stream << "require-mppe-40\n";
-						}
-					}
-					else
-					{
-						stream << "require-mppe-128\n";
-					}
-					//stream << "require-mppe-40\n";
-					stream << "require-mppe\n";
+						stream << ",no128";
+					
+					if (GlobalConfig->currentProfile->getRefuse40BitEncryption())
+						stream << ",no40";
+					
+					stream << "\n";
 				}
 				else
 				{
-					stream  << "# disable MPPE compression\n";
+					stream  << "# disable MPPE encryption\n";
 					stream << "nomppe\n" ;
 					stream << "\n";
 				}
 
-				if (GlobalConfig->currentProfile->getAllowStatefulMode())
-				{
-					stream << "# Allow MPPE stateful mode\n";
-					stream << "mppe-stateful\n";
-					stream << "\n";
-				}
 
 				if (GlobalConfig->enableDebugPppd)
 				{
@@ -2123,7 +2114,7 @@
 				else
 				{
 					stream << "# Use BSD compression\n";
-					stream << "bsdcomp\n";
+					stream << "bsdcomp 9,15\n";
 					stream << "\n";
 				}
 
@@ -2137,7 +2128,7 @@
 				{
 					stream << "# Use deflate method\n";
 					// FIXME make values dynamiclly
-					stream << "deflate 9,9\n";
+					stream << "deflate 9,15\n";
 					stream << "\n";
 				}
 
@@ -2169,7 +2160,7 @@
 				if (GlobalConfig->currentProfile->getDisableMPPEComp() )
 				{
 					stream << "# disable Microsoft Point-to-Point Compression (MPPC) (i.e. for compatibility with watchguard firebox)\n";
-					stream << "nopcomp\n";
+					stream << "nomppc\n";
 					stream << "\n";
 				}
 
@@ -2188,24 +2179,21 @@
 					stream << "# generated by kvpnc. Do not edit it." << "\n";
 					stream << "# profile: " + GlobalConfig->currentProfile->getName() << "\n";
 					stream << "# client server secret IP addresses" << "\n";
+
+					if (GlobalConfig->currentProfile->getSaveUserPassword())
+						TmpPassword = GlobalConfig->currentProfile->getUserPassword();
+
+
 					if (GlobalConfig->currentProfile->getUseAdvancedSettings() && GlobalConfig->currentProfile->getUseNtDomainName() && !GlobalConfig->currentProfile->getNtDomainName().isEmpty())
 					{
-						stream << "PPTP " << GlobalConfig->currentProfile->getNtDomainName() << "\\\\" << GlobalConfig->currentProfile->getUserName()<<" *\n";
+						stream << GlobalConfig->currentProfile->getName() + " " << GlobalConfig->currentProfile->getNtDomainName() << "\\\\" << GlobalConfig->currentProfile->getUserName() + " " <<  TmpPassword << " *\n";
+						stream << GlobalConfig->currentProfile->getNtDomainName() << "\\\\" << GlobalConfig->currentProfile->getUserName()<< " "+GlobalConfig->currentProfile->getName() + " " <<  TmpPassword << " *\n";
 					}
 					else
 					{
-						//   stream << GlobalConfig->currentProfile->getUserName() << " " << GlobalConfig->currentProfile->getName() << " " <<  GlobalConfig->currentProfile->getUserPassword() << " *\n";
-						if (GlobalConfig->currentProfile->getSaveUserPassword())
-						{
-							stream << GlobalConfig->currentProfile->getUserName() << " " << "pptp-server" << " " <<  GlobalConfig->currentProfile->getUserPassword() << " *\n";
-							stream << "pptp-server "  << GlobalConfig->currentProfile->getUserName() << " " <<  GlobalConfig->currentProfile->getUserPassword() << " *\n";
-						}
-						else
-						{
-							stream << GlobalConfig->currentProfile->getUserName() << " " << "pptp-server" << " " <<  TmpPassword << " *\n";
-							stream << "pptp-server" << GlobalConfig->currentProfile->getUserName() << " " << " " <<  TmpPassword << " *\n";
-						}
 
+						stream << GlobalConfig->currentProfile->getName() + " " << GlobalConfig->currentProfile->getUserName() + " " <<  TmpPassword << " *\n";
+						stream << GlobalConfig->currentProfile->getUserName() + " " << GlobalConfig->currentProfile->getName() + " "  <<  TmpPassword << " *\n";
 					}
 					file.close();
 				}