v4.27-9667-betav4.27-9667-beta

12 files changed, 27 insertions, 21 deletions

diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs
index c4d5dde6..220740c0 100644
--- a/src/BuildUtil/UnixBuildSoftwares.cs
+++ b/src/BuildUtil/UnixBuildSoftwares.cs
@@ -957,6 +957,15 @@ namespace BuildUtil
 			{

 				options.Add("-O2");

 			}

+

+			if (this.Os == OSList.Linux)

+			{

+				if (this.Cpu == CpuList.x64 || this.Cpu == CpuList.x86 || this.Cpu == CpuList.intel)

+				{

+					options.Add("-no-pie");

+				}

+			}

+

 			options.Add("-fsigned-char");

 			if (this.NoPThreadOption == false)

 			{

diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c
index 8a2dc133..96445159 100644
--- a/src/Cedar/CM.c
+++ b/src/Cedar/CM.c
@@ -5719,13 +5719,10 @@ void CmMainWindowOnCommandEx(HWND hWnd, WPARAM wParam, LPARAM lParam, bool easy)
 			break;

 		}

 		// Warning message

-		if (MsIsWindows10())

+		if (MsgBox(hWnd, MB_ICONINFORMATION | MB_OKCANCEL, _UU("CM_VLAN_REINSTALL_MSG")) == IDCANCEL)

 		{

-			if (MsgBox(hWnd, MB_ICONINFORMATION | MB_OKCANCEL, _UU("CM_VLAN_REINSTALL_MSG")) == IDCANCEL)

-			{

-				// Cancel

-				break;

-			}

+			// Cancel

+			break;

 		}

 		index = LvGetSelected(hWnd, L_VLAN);

 		if (index != INFINITE)

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 575205f2..ce28bef5 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -138,7 +138,7 @@
 #define	CEDAR_VER					427

 

 // Build Number

-#define	CEDAR_BUILD					9666

+#define	CEDAR_BUILD					9667

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -153,16 +153,16 @@
 

 // Specify the location to build

 #ifndef	BUILD_PLACE

-#define	BUILD_PLACE			"pc34"

+#define	BUILD_PLACE			"pc33"

 #endif	// BUILD_PLACE

 

 // Specifies the build date

 #define	BUILD_DATE_Y		2018

-#define	BUILD_DATE_M		4

-#define	BUILD_DATE_D		21

-#define	BUILD_DATE_HO		14

-#define	BUILD_DATE_MI		23

-#define	BUILD_DATE_SE		36

+#define	BUILD_DATE_M		5

+#define	BUILD_DATE_D		26

+#define	BUILD_DATE_HO		8

+#define	BUILD_DATE_MI		20

+#define	BUILD_DATE_SE		23

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c
index a86c4ea9..4c09a47f 100644
--- a/src/Cedar/Client.c
+++ b/src/Cedar/Client.c
@@ -431,7 +431,7 @@ void CiChangeAllVLanMacAddress(CLIENT *c)
 			RPC_CLIENT_ENUM_VLAN_ITEM *e = t.Items[i];

 			UCHAR mac[6];

 

-			if (StrToMac(mac, e->MacAddress) && ((mac[0] == 0x00 && mac[1] == 0xAC) || (mac[0] = 0x5E)))

+			if (StrToMac(mac, e->MacAddress) && ((mac[0] == 0x00 && mac[1] == 0xAC) || (mac[0] == 0x5E)))

 			{

 				char *name = e->DeviceName;

 				RPC_CLIENT_SET_VLAN s;

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index ba24ed69..8e1223e4 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9666

+BUILD_NUMBER 9667

 VERSION 427

 BUILD_NAME beta

-BUILD_DATE 20180421_142336

+BUILD_DATE 20180526_082023

diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index a34bd83c..180de602 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -1004,7 +1004,7 @@ CM_WOULDYOULOAD_IE_PROXY	目前，这台计算机的 Internet Explorer 配置使
 CM_MSG_TITLE				VPN Server "%S" (虚拟 HUB: "%S")

 CM_JUMPLIST_RCCONNECT		最近使用的连接设置

 CM_VPNGATE_MESSAGE			在 VPN Gate 学术项目网站上有一个公共 VPN 中继服务器列表。\r\n互联网上的任何人都可以建立 VPN 连接至任一列表上的 VPN 服务器。无需用户注册。\r\n\r\nVPN Gate 不是 SoftEther VPN 的一部分。\r\n此图标只提供了一个超链接到 http://www.vpngate.net/。\r\n\r\n安装带有 SoftEther VPN Client 的 VPN Gate Client 插件。它可用简单的配置连接到 VPN Gate 的一个公共 VPN 中继服务器。\r\n\r\n你想访问 http://www.vpngate.net/ (设在日本筑波大学) ?

-CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, the MAC address associated to the current Virtual Network Adapter will change. Also, all TCP/IP settings with the Virtual Network Adapter will reset.\r\n\r\nIn the case that the reinstalled Virtual Network Adapter fails to activate, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

+CM_VLAN_REINSTALL_MSG	After reinstalling the Virtual Network Adapter driver, the current Virtual Network Adapter's MAC address will change. Also, all TCP/IP settings within the Virtual Network Adapter will reset.\r\n\r\nIn case the reinstalled Virtual Network Adapter fails to work, delete it and create a new one. If it still doesn't work properly, please create a new Virtual Network Adapter with a different name.

 

 

 # VPN Gate Service

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index e3dbb574..5b22d9ac 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -995,7 +995,7 @@ CM_WOULDYOULOAD_IE_PROXY	Currently the Internet Explorer on this computer is con
 CM_MSG_TITLE			VPN Server "%S" (Virtual Hub: "%S")

 CM_JUMPLIST_RCCONNECT	Recent VPN Servers

 CM_VPNGATE_MESSAGE		There is the list of Public VPN Relay Servers on the VPN Gate Academic Project Web Site.\r\nAnyone on the Internet can connect a VPN connection to any VPN servers on the list.\r\n\r\nVPN Gate Academic Project is not a part of SoftEther VPN.\r\nThis icon provides just a link to http://www.vpngate.net/.\r\nYou need to install VPN Gate Plugin to connect VPN Gate.\r\n\r\nDo you want to visit http://www.vpngate.net/ (provided by University of Tsukuba) ?

-CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, the MAC address associated to the current Virtual Network Adapter will change. Also, all TCP/IP settings with the Virtual Network Adapter will reset.\r\n\r\nIn the case that the reinstalled Virtual Network Adapter fails to activate, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

+CM_VLAN_REINSTALL_MSG	After reinstalling the Virtual Network Adapter driver, the current Virtual Network Adapter's MAC address will change. Also, all TCP/IP settings within the Virtual Network Adapter will reset.\r\n\r\nIn case the reinstalled Virtual Network Adapter fails to work, delete it and create a new one. If it still doesn't work properly, please create a new Virtual Network Adapter with a different name.

 

 

 VGC_COLUMN_0			DDNS Hostname

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index b0c04b61..66e116b7 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index ebb73736..9e401ce1 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index 855ef287..d2cade60 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 14:23:50 2018

+/* at Sat May 26 08:20:42 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index e102fed4..5ebbc641 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 14:23:50 2018

+/* at Sat May 26 08:20:42 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index 17d1bc1d..ed041536 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 14:23:50 2018

+/* at Sat May 26 08:20:42 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)