diff options
| author | dnobori <da.git@softether.co.jp> | 2020-04-05 18:18:10 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2020-04-05 18:18:10 +0300 |
| commit | ec3d052e218281dc1aa734f1bf84cf42127744aa (patch) | |
| tree | 57d93439046db9bcb9f8a83b3014aa7040a56b0b | |
| parent | e3370fb62c31eb10d0d221e628161863358d4cc3 (diff) | |
v4.34-9745-betav4.34-9745-beta
| -rw-r--r-- | src/Cedar/Admin.c | 9 | ||||
| -rw-r--r-- | src/Cedar/Cedar.h | 12 | ||||
| -rw-r--r-- | src/CurrentBuild.txt | 4 | ||||
| -rw-r--r-- | src/bin/vpnweb.cab | bin | 206827 -> 206823 bytes | |||
| -rw-r--r-- | src/bin/vpnweb.ocx | bin | 341816 -> 341816 bytes | |||
| -rw-r--r-- | src/vpnweb/vpnweb.h | 2 | ||||
| -rw-r--r-- | src/vpnweb/vpnweb_i.c | 2 | ||||
| -rw-r--r-- | src/vpnweb/vpnweb_p.c | 2 |
8 files changed, 17 insertions, 14 deletions
diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c index 1b4702dd..6bc4edd4 100644 --- a/src/Cedar/Admin.c +++ b/src/Cedar/Admin.c @@ -1109,11 +1109,14 @@ ADMIN *JsonRpcAuthLogin(CEDAR *c, SOCK *sock, HTTP_HEADER *h) {
Lock(h->lock);
{
- if (Cmp(pw_hash, h->HashedPassword, SHA1_SIZE) == 0)
+ if (Cmp(h->HashedPassword, empty_pw_hash, SHA1_SIZE) != 0 && IsZero(h->HashedPassword, sizeof(h->HashedPassword)) == false)
{
- is_hub_admin = true;
+ if (Cmp(pw_hash, h->HashedPassword, SHA1_SIZE) == 0)
+ {
+ is_hub_admin = true;
- StrCpy(hub_name, sizeof(hub_name), h->Name);
+ StrCpy(hub_name, sizeof(hub_name), h->Name);
+ }
}
}
Unlock(h->lock);
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 909900c1..acca6d08 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -129,7 +129,7 @@ #define CEDAR_VER 434
// Build Number
-#define CEDAR_BUILD 9744
+#define CEDAR_BUILD 9745
// Beta number
//#define BETA_NUMBER 3
@@ -149,11 +149,11 @@ // Specifies the build date
#define BUILD_DATE_Y 2020
-#define BUILD_DATE_M 3
-#define BUILD_DATE_D 20
-#define BUILD_DATE_HO 19
-#define BUILD_DATE_MI 2
-#define BUILD_DATE_SE 37
+#define BUILD_DATE_M 4
+#define BUILD_DATE_D 5
+#define BUILD_DATE_HO 23
+#define BUILD_DATE_MI 20
+#define BUILD_DATE_SE 52
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt index 8c643006..e123503d 100644 --- a/src/CurrentBuild.txt +++ b/src/CurrentBuild.txt @@ -1,4 +1,4 @@ -BUILD_NUMBER 9744
+BUILD_NUMBER 9745
VERSION 434
BUILD_NAME beta
-BUILD_DATE 20200320_190237
+BUILD_DATE 20200405_232052
diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab Binary files differindex f1ef6a0b..0776defd 100644 --- a/src/bin/vpnweb.cab +++ b/src/bin/vpnweb.cab diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx Binary files differindex 968fce18..1982cb76 100644 --- a/src/bin/vpnweb.ocx +++ b/src/bin/vpnweb.ocx diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h index a3a1b54c..5a14eef9 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 Fri Mar 20 19:02:54 2020
+/* at Sun Apr 05 23:21:10 2020
*/
/* 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 a2785542..5cc5ca34 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 Fri Mar 20 19:02:54 2020
+/* at Sun Apr 05 23:21:10 2020
*/
/* 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 83ed5773..197e8381 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 Fri Mar 20 19:02:54 2020
+/* at Sun Apr 05 23:21:10 2020
*/
/* Compiler settings for .\vpnweb.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
|