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

Shorten and clarify log window messages

Browse Source 
Specify display in the "login failed" message. Print the section name
that wasn't found. Remove stdout message about missing section,
xrdp_wm_log_msg() already writes to stdout.
This commit is contained in:
Pavel Roskin 2016-06-21 16:30:16 -07:00
parent a1b7de5679
commit 6f5feb61e0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xrdp/xrdp_mm.c
View File

@ -1203,8 +1203,7 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
{ {
self->display = display; self->display = display;
xrdp_wm_log_msg(self->wm, LOG_LEVEL_INFO, xrdp_wm_log_msg(self->wm, LOG_LEVEL_INFO,
"xrdp_mm_process_login_response: login successful " "login successful for display %d", display);
"for display %d", display);
if (xrdp_mm_setup_mod1(self) == 0) if (xrdp_mm_setup_mod1(self) == 0)
{ {
@ -1231,7 +1230,7 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
else else
{ {
xrdp_wm_log_msg(self->wm, LOG_LEVEL_INFO, xrdp_wm_log_msg(self->wm, LOG_LEVEL_INFO,
"xrdp_mm_process_login_response: login failed"); "login failed for display %d", display);
xrdp_wm_show_log(self->wm); xrdp_wm_show_log(self->wm);
if (self->wm->hide_log_window) if (self->wm->hide_log_window)
{ {

5
xrdp/xrdp_wm.c
View File

@ -679,10 +679,9 @@ xrdp_wm_init(struct xrdp_wm *self)
else else
{ {
/* requested module name not found in xrdp.ini */ /* requested module name not found in xrdp.ini */
g_writeln(" xrdp_wm_init: file_read_section returned non-zero, requested section not found in xrdp.ini");
xrdp_wm_log_msg(self, LOG_LEVEL_ERROR, xrdp_wm_log_msg(self, LOG_LEVEL_ERROR,
"ERROR: The requested xrdp module not found in " "Section \"%s\" not configured in xrdp.ini",
"xrdp.ini, falling back to login window"); section_name);
} }
list_delete(names); list_delete(names);