v4.05-9423-beta

3 files changed, 14 insertions, 13 deletions

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index fa32e89a..c0f972da 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -117,7 +117,7 @@
 #define	CEDAR_VER					405

 

 // Build Number

-#define	CEDAR_BUILD					9422

+#define	CEDAR_BUILD					9423

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -138,10 +138,10 @@
 // Specifies the build date

 #define	BUILD_DATE_Y		2014

 #define	BUILD_DATE_M		2

-#define	BUILD_DATE_D		17

-#define	BUILD_DATE_HO		1

-#define	BUILD_DATE_MI		29

-#define	BUILD_DATE_SE		56

+#define	BUILD_DATE_D		18

+#define	BUILD_DATE_HO		19

+#define	BUILD_DATE_MI		9

+#define	BUILD_DATE_SE		44

 

 // Tolerable time difference

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

diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c
index aec38410..c4694177 100644
--- a/src/Cedar/SeLowUser.c
+++ b/src/Cedar/SeLowUser.c
@@ -139,6 +139,12 @@ bool SuInstallDriverInner(bool force)
 		return false;

 	}

 

+	if (MsIsServiceRunning("RemoteAccess"))

+	{

+		// Remote Access service is running

+		return false;

+	}

+

 	CombinePathW(tmp_dir, sizeof(tmp_dir), MsGetWindowsDirW(), L"Temp");

 	MakeDirExW(tmp_dir);

 

diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c
index 0e6dcabe..f4adda60 100644
--- a/src/Cedar/Server.c
+++ b/src/Cedar/Server.c
@@ -2468,13 +2468,8 @@ void SiLoadInitialConfiguration(SERVER *s)
 

 		{

 			// Enable VPN-over-ICMP" and VPN-over-DNS for default setting

-			s->EnableVpnOverIcmp = SiCanOpenVpnOverIcmpPort();

-			s->EnableVpnOverDns = SiCanOpenVpnOverDnsPort();

-

-#ifdef	OS_WIN32

-			// Over-DNS is disabled on Windows by default

+			s->EnableVpnOverIcmp = false;

 			s->EnableVpnOverDns = false;

-#endif	// OS_WIN32

 		}

 	}

 

@@ -5687,7 +5682,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
 			}

 			else

 			{

-				s->EnableVpnOverIcmp = SiCanOpenVpnOverIcmpPort();;

+				s->EnableVpnOverIcmp = false;

 			}

 

 			// Enable the VPN-over-DNS

@@ -5697,7 +5692,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
 			}

 			else

 			{

-				s->EnableVpnOverDns = SiCanOpenVpnOverDnsPort();

+				s->EnableVpnOverDns = false;

 			}

 		}