jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xrdp: change when using xrdp.ini hidelogwindow

Browse Source
This commit is contained in:
Jay Sorg 2015-12-01 23:10:09 -08:00
parent 9f710ce94a
commit f49e2058df
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xrdp/xrdp_mm.c
View File

@ -578,6 +578,10 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self)
else else
{ {
xrdp_wm_show_log(self->wm); xrdp_wm_show_log(self->wm);
if (self->wm->hide_log_window)
{
rv = 1;
}
} }
} }
@ -1231,6 +1235,10 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
log_message(LOG_LEVEL_INFO,"xrdp_mm_process_login_response: " log_message(LOG_LEVEL_INFO,"xrdp_mm_process_login_response: "
"login failed"); "login failed");
xrdp_wm_show_log(self->wm); xrdp_wm_show_log(self->wm);
if (self->wm->hide_log_window)
{
rv = 1;
}
} }
cleanup_sesman_connection(self); cleanup_sesman_connection(self);
@ -2155,6 +2163,11 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
if (trans_check_wait_objs(self->sesman_trans) != 0) if (trans_check_wait_objs(self->sesman_trans) != 0)
{ {
self->delete_sesman_trans = 1; self->delete_sesman_trans = 1;
if (self->wm->hide_log_window)
{
/* if hide_log_window, this is fatal */
rv = 1;
}
} }
} }

5
xrdp/xrdp_wm.c
View File

@ -560,7 +560,7 @@ xrdp_wm_init(struct xrdp_wm *self)
xrdp_wm_load_static_pointers(self); xrdp_wm_load_static_pointers(self);
self->screen->bg_color = self->xrdp_config->cfg_globals.ls_top_window_bg_color; self->screen->bg_color = self->xrdp_config->cfg_globals.ls_top_window_bg_color;
if (self->session->client_info->rdp_autologin) if (self->session->client_info->rdp_autologin || self->hide_log_window)
{ {
/* /*
* NOTE: this should eventually be accessed from self->xrdp_config * NOTE: this should eventually be accessed from self->xrdp_config
@ -576,7 +576,8 @@ xrdp_wm_init(struct xrdp_wm *self)
values->auto_free = 1; values->auto_free = 1;
/* look for module name to be loaded */ /* look for module name to be loaded */
if (autorun_name[0] != 0) { if (autorun_name[0] != 0)
{
/* if autorun is configured in xrdp.ini, we enforce that module to be loaded */ /* if autorun is configured in xrdp.ini, we enforce that module to be loaded */
g_strncpy(section_name, autorun_name, 255); g_strncpy(section_name, autorun_name, 255);
} }