From 13f6de368022312223131d399a5321f5305d88d8 Mon Sep 17 00:00:00 2001 From: Weichun Date: Fri, 23 Jun 2023 18:27:15 +0800 Subject: [PATCH 1/2] fix session id2 datetype missmatch --- monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index 51ab6d6c36c..337ec24ccf0 100644 --- a/monitor.c +++ b/monitor.c @@ -164,7 +164,7 @@ static char *hostbased_cuser = NULL; static char *hostbased_chost = NULL; static char *auth_method = "unknown"; static char *auth_submethod = NULL; -static u_int session_id2_len = 0; +static size_t session_id2_len = 0; static u_char *session_id2 = NULL; static pid_t monitor_child_pid; From f786837347ef74be9a7308afbd19b5f13b5e9505 Mon Sep 17 00:00:00 2001 From: Weichun Date: Fri, 29 Sep 2023 00:01:07 +0800 Subject: [PATCH 2/2] update session_id2_len definition with WINDOWS identifier --- monitor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monitor.c b/monitor.c index 337ec24ccf0..fb52c335d87 100644 --- a/monitor.c +++ b/monitor.c @@ -164,7 +164,11 @@ static char *hostbased_cuser = NULL; static char *hostbased_chost = NULL; static char *auth_method = "unknown"; static char *auth_submethod = NULL; +#ifdef WINDOWS static size_t session_id2_len = 0; +#else +static u_int session_id2_len = 0; +#endif /* WINDOWS */ static u_char *session_id2 = NULL; static pid_t monitor_child_pid;