浏览代码

v4.34-9745-beta

dnobori 5 年之前
父节点
当前提交
ec3d052e21
共有 8 个文件被更改,包括 17 次插入14 次删除
  1. 6 3
      src/Cedar/Admin.c
  2. 6 6
      src/Cedar/Cedar.h
  3. 2 2
      src/CurrentBuild.txt
  4. 二进制
      src/bin/vpnweb.cab
  5. 二进制
      src/bin/vpnweb.ocx
  6. 1 1
      src/vpnweb/vpnweb.h
  7. 1 1
      src/vpnweb/vpnweb_i.c
  8. 1 1
      src/vpnweb/vpnweb_p.c

+ 6 - 3
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);

+ 6 - 6
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)

+ 2 - 2
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

二进制
src/bin/vpnweb.cab


二进制
src/bin/vpnweb.ocx


+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
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)