summaryrefslogtreecommitdiffstats
path: root/sesman/scp_v1_mng.c
diff options
context:
space:
mode:
authorBen Cohen <ben-cohen@users.noreply.github.com>2017-07-05 20:39:01 +0100
committermetalefty <meta@vmeta.jp>2017-07-06 13:40:25 +0900
commitc7d08bd9e7bcd00b11328537319ec7748a797574 (patch)
treed9c166ca57d150d516ed6e17aa9b0496bd4c5a88 /sesman/scp_v1_mng.c
parentaa4b90d250c5e814372751007c2f8cb2e9bae629 (diff)
downloadxrdp-proprietary-c7d08bd9e7bcd00b11328537319ec7748a797574.tar.gz
xrdp-proprietary-c7d08bd9e7bcd00b11328537319ec7748a797574.zip
xrdp-sesadmin: fix error when there are no sessions
Test case: On a system running xrdp with no sessions running run: xrdp-sesadmin -u=<user> -p=<password> -c=list Expected result: "No sessions." (ignoring debug output) Observed result: "Error getting session list." In the SCP_SERVER_STATE_MNG_LISTREQ case in scp_v1_mng_process() if there are no sessions it ends the scp session, which causes an error in the client. In commit 0017081d the client was changed to report errors, giving the result above. Fix by calling scp_v1s_mng_list_sessions() from scp_v1_mng_process() even when there are no sessions, and if so sending a packet with a count of zero so that the client gets what it expects.
Diffstat (limited to 'sesman/scp_v1_mng.c')
-rw-r--r--sesman/scp_v1_mng.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sesman/scp_v1_mng.c b/sesman/scp_v1_mng.c
index 044b35ad..d44b9e04 100644
--- a/sesman/scp_v1_mng.c
+++ b/sesman/scp_v1_mng.c
@@ -84,19 +84,13 @@ scp_v1_mng_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
/* list disconnected sessions */
slist = session_get_byuser(NULL, &scount, SESMAN_SESSION_STATUS_ALL);
LOG_DBG("sessions on TS: %d (slist: %x)", scount, slist);
-
if (0 == slist)
{
- // e=scp_v1s_connection_error(c, "Internal error");
log_message(LOG_LEVEL_INFO, "No sessions on Terminal Server");
- end = 0;
- }
- else
- {
- e = scp_v1s_mng_list_sessions(c, s, scount, slist);
- g_free(slist);
}
+ e = scp_v1s_mng_list_sessions(c, s, scount, slist);
+ g_free(slist);
break;
default:
/* we check the other errors */