diff options
| author | dnobori <da.git@softether.co.jp> | 2014-03-20 12:05:40 +0400 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2014-03-20 12:05:40 +0400 |
| commit | dc5d3ee2aeab6cb5c5a9dfa0036edfe4b1565cca (patch) | |
| tree | f08bd3871cf90f7926a0a73a91e3486af48789b0 /src/Cedar | |
| parent | cf2a6a42bce34bd0c14223cd9e86d2395d3bd01c (diff) | |
v4.06-9432-beta
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/CM.c | 4 | ||||
| -rw-r--r-- | src/Cedar/Cedar.h | 8 | ||||
| -rw-r--r-- | src/Cedar/Protocol.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index bdbbcae6..d04f9a12 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -7521,6 +7521,8 @@ UINT CmEditAccountDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, voi {
if (InStr(tmp, "/tcp") == false)
{
+ Trim(tmp);
+
StrCat(tmp, sizeof(tmp), "/tcp");
SetTextA(hWnd, E_HOSTNAME, tmp);
@@ -7536,6 +7538,8 @@ UINT CmEditAccountDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, voi {
tmp[i] = 0;
+ Trim(tmp);
+
SetTextA(hWnd, E_HOSTNAME, tmp);
}
}
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index b003af64..abd277a6 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -123,7 +123,7 @@ #define CEDAR_VER 406
// Build Number
-#define CEDAR_BUILD 9430
+#define CEDAR_BUILD 9432
// Beta number
//#define BETA_NUMBER 3
@@ -145,9 +145,9 @@ #define BUILD_DATE_Y 2014
#define BUILD_DATE_M 3
#define BUILD_DATE_D 20
-#define BUILD_DATE_HO 4
-#define BUILD_DATE_MI 8
-#define BUILD_DATE_SE 6
+#define BUILD_DATE_HO 16
+#define BUILD_DATE_MI 0
+#define BUILD_DATE_SE 47
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index b421d21a..a57ee101 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -1577,7 +1577,7 @@ bool ServerAccept(CONNECTION *c) break;
case CLIENT_AUTHTYPE_CERT:
- if (GetGlobalServerFlag(GSF_DISABLE_CERT_AUTH) != 0)
+ if (GetGlobalServerFlag(GSF_DISABLE_CERT_AUTH) == 0)
{
// Certificate authentication
cert_size = PackGetDataSize(p, "cert");
|