diff options
| author | Mykhaylo Yehorov <yehorov@gmail.com> | 2015-07-26 23:10:21 +0300 |
|---|---|---|
| committer | Mykhaylo Yehorov <yehorov@gmail.com> | 2015-07-26 23:10:21 +0300 |
| commit | 1cf9df55391fe086913c623ed809a1f7ad43797b (patch) | |
| tree | 647f180c010e9afdb518b4e662bf277fe55f2f34 /src/Cedar | |
| parent | 7772ee119ee0d2adb4d48e675cc0c4785b464475 (diff) | |
| parent | 4b65e251f240d0b36c704acd598f4ceb07c41413 (diff) | |
merge upstream v4.18-9570-rtm
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/Cedar.c | 16 | ||||
| -rw-r--r-- | src/Cedar/Cedar.h | 14 | ||||
| -rw-r--r-- | src/Cedar/Client.c | 2 | ||||
| -rw-r--r-- | src/Cedar/IPsec_Win7.c | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c index fe7333eb..73fcf085 100644 --- a/src/Cedar/Cedar.c +++ b/src/Cedar/Cedar.c @@ -235,18 +235,18 @@ bool IsSupportedWinVer(RPC_WINVER *v) }
}
-#if 0
- // Enable in future when supported
- if ((v->VerMajor == 6 && v->VerMinor == 4) ||(v->VerMajor == 10 && v->VerMinor == 0))
+ if ((v->VerMajor == 6 && v->VerMinor == 4) || (v->VerMajor == 10 && v->VerMinor == 0))
{
- // Windows 10, Server 10
- if (v->ServicePack <= 0)
+ if (v->IsServer == false)
{
- // SP0 only
- return true;
+ // Windows 10 (not Windows Server 2016)
+ if (v->ServicePack <= 0)
+ {
+ // SP0 only
+ return true;
+ }
}
}
-#endif
return false;
}
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 1be5df52..78c4192a 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -135,10 +135,10 @@ // Version number
-#define CEDAR_VER 417
+#define CEDAR_VER 418
// Build Number
-#define CEDAR_BUILD 9566
+#define CEDAR_BUILD 9570
// Beta number
//#define BETA_NUMBER 3
@@ -153,16 +153,16 @@ // Specify the location to build
#ifndef BUILD_PLACE
-#define BUILD_PLACE "pc25"
+#define BUILD_PLACE "pc30"
#endif // BUILD_PLACE
// Specifies the build date
#define BUILD_DATE_Y 2015
#define BUILD_DATE_M 7
-#define BUILD_DATE_D 16
-#define BUILD_DATE_HO 21
-#define BUILD_DATE_MI 34
-#define BUILD_DATE_SE 56
+#define BUILD_DATE_D 26
+#define BUILD_DATE_HO 14
+#define BUILD_DATE_MI 59
+#define BUILD_DATE_SE 55
// 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 e87978d4..6e95df27 100644 --- a/src/Cedar/Client.c +++ b/src/Cedar/Client.c @@ -8450,7 +8450,7 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create) return false;
}
- // Regulation in Windows 8
+ // Regulation in Windows 8 / 10
if (MsIsInfCatalogRequired())
{
if (CiIsValidVLanRegulatedName(create->DeviceName) == false)
diff --git a/src/Cedar/IPsec_Win7.c b/src/Cedar/IPsec_Win7.c index 8672bee2..7abf33e6 100644 --- a/src/Cedar/IPsec_Win7.c +++ b/src/Cedar/IPsec_Win7.c @@ -109,7 +109,7 @@ // IPsec_Win7.c
-// Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012
+// Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012 / Windows 10
#include <GlobalConst.h>
|