From ec3d052e218281dc1aa734f1bf84cf42127744aa Mon Sep 17 00:00:00 2001 From: dnobori Date: Mon, 6 Apr 2020 00:18:10 +0900 Subject: v4.34-9745-beta --- src/Cedar/Admin.c | 9 ++++++--- src/Cedar/Cedar.h | 12 ++++++------ src/CurrentBuild.txt | 4 ++-- src/bin/vpnweb.cab | Bin 206827 -> 206823 bytes src/bin/vpnweb.ocx | Bin 341816 -> 341816 bytes src/vpnweb/vpnweb.h | 2 +- src/vpnweb/vpnweb_i.c | 2 +- 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 index f1ef6a0b..0776defd 100644 Binary files a/src/bin/vpnweb.cab and b/src/bin/vpnweb.cab differ diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx index 968fce18..1982cb76 100644 Binary files a/src/bin/vpnweb.ocx and b/src/bin/vpnweb.ocx differ 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) -- cgit v1.2.3