summaryrefslogtreecommitdiffstats
path: root/libxrdp
diff options
context:
space:
mode:
authorLaxmikant Rashinkar <LK.Rashinkar@gmail.com>2013-11-06 19:48:34 -0800
committerLaxmikant Rashinkar <LK.Rashinkar@gmail.com>2013-11-06 19:48:34 -0800
commite8c2f328fb1c5ef118c045e8275878b81349988d (patch)
tree6c2f18d69f1d0f94552b360a684bb85e5d395a39 /libxrdp
parent3a074450d7af4a80a8cdfc6b586da2b021fb0f37 (diff)
parent1c1de464263395ad40955242949863cc2ad396fb (diff)
downloadxrdp-proprietary-e8c2f328fb1c5ef118c045e8275878b81349988d.tar.gz
xrdp-proprietary-e8c2f328fb1c5ef118c045e8275878b81349988d.zip
Merge branch 'master' of github.com:neutrinolabs/xrdp
Diffstat (limited to 'libxrdp')
-rw-r--r--libxrdp/xrdp_sec.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index dd0e2cd6..f52a080d 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -540,7 +540,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
{
return 1;
}
- in_uint32_le(s, tzone); /* len of timetone */
+ in_uint32_le(s, tzone); /* len of timezone */
in_uint8s(s, 62); /* skip */
in_uint8s(s, 22); /* skip misc. */
in_uint8s(s, 62); /* skip */
@@ -990,17 +990,19 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
g_writeln("monitorCount= %d", monitorCount); // for debugging only
+ client_info->monitorCount = monitorCount;
+
/* Add client_monitor_data to client_info struct, will later pass to X11rdp */
for (index = 0; index < monitorCount; index++)
{
- in_uint32_le(s, client_info->minfo->left);
- in_uint32_le(s, client_info->minfo->top);
- in_uint32_le(s, client_info->minfo->right);
- in_uint32_le(s, client_info->minfo->bottom);
- in_uint32_le(s, client_info->minfo->is_primary);
+ in_uint32_le(s, client_info->minfo[index].left);
+ in_uint32_le(s, client_info->minfo[index].top);
+ in_uint32_le(s, client_info->minfo[index].right);
+ in_uint32_le(s, client_info->minfo[index].bottom);
+ in_uint32_le(s, client_info->minfo[index].is_primary);
- g_writeln("got a monitor: left= %d, top= %d, right= %d, bottom= %d, is_primary?= %d", client_info->minfo->left,
- client_info->minfo->top, client_info->minfo->right, client_info->minfo->bottom, client_info->minfo->is_primary);
+ g_writeln("got a monitor: left= %d, top= %d, right= %d, bottom= %d, is_primary?= %d", client_info->minfo[index].left,
+ client_info->minfo[index].top, client_info->minfo[index].right, client_info->minfo[index].bottom, client_info->minfo[index].is_primary);
}
return 0;
}