diff options
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/Admin.c | 9 | ||||
| -rw-r--r-- | src/Cedar/Cedar.h | 12 |
2 files changed, 12 insertions, 9 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)
|