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

o default login limit is now 50 users (instead of 10)

Browse Source 
o we now wait for 30 seconds for session connection (instead of 1)
o if AUTO_LOGON flag is set but username is null, we force login dialog to show up
This commit is contained in:
Laxmikant Rashinkar 2014-02-28 19:28:31 -08:00
parent 0b18909f26
commit e7445a2544
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libxrdp/xrdp_sec.c
View File

@ -543,6 +543,16 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
} }
in_uint16_le(s, len_user); in_uint16_le(s, len_user);
/*
* Microsoft's itap client running on Mac OS/Android
* always sends autologon credentials, even when user has not
* configured any
*/
if (len_user == 0)
{
self->rdp_layer->client_info.rdp_autologin = 0;
}
if (len_user > 511) if (len_user > 511)
{ {
DEBUG(("ERROR [xrdp_sec_process_logon_info()]: len_user > 511")); DEBUG(("ERROR [xrdp_sec_process_logon_info()]: len_user > 511"));

2
sesman/sesman.ini
View File

@ -16,7 +16,7 @@ AlwaysGroupCheck = false
[Sessions] [Sessions]
X11DisplayOffset=10 X11DisplayOffset=10
MaxSessions=10 MaxSessions=50
# if 1, true, or yes, kill session after 60 seconds # if 1, true, or yes, kill session after 60 seconds
KillDisconnected=0 KillDisconnected=0
# if not zero, the seconds without mouse or keyboard input before disconnect # if not zero, the seconds without mouse or keyboard input before disconnect

12
xup/xup.c
View File

@ -223,7 +223,7 @@ lib_mod_connect(struct mod *mod)
g_tcp_set_no_delay(mod->sck); g_tcp_set_no_delay(mod->sck);
} }
mod->server_msg(mod, "connecting...", 0); /* mod->server_msg(mod, "connecting...", 0); */
if (use_uds) if (use_uds)
{ {
@ -255,7 +255,7 @@ lib_mod_connect(struct mod *mod)
} }
else else
{ {
mod->server_msg(mod, "connect error", 0); /* mod->server_msg(mod, "connect error", 0); */
} }
} }
@ -268,13 +268,13 @@ lib_mod_connect(struct mod *mod)
mod->sck = 0; mod->sck = 0;
i++; i++;
if (i >= 4) if (i >= 60)
{ {
mod->server_msg(mod, "connection problem, giving up", 0); mod->server_msg(mod, "connection problem, giving up", 0);
break; break;
} }
g_sleep(250); g_sleep(500);
} }
if (error == 0) if (error == 0)
@ -1229,7 +1229,7 @@ process_server_paint_rect_shmem_ex(struct mod *amod, struct stream *s)
in_uint16_le(s, width); in_uint16_le(s, width);
in_uint16_le(s, height); in_uint16_le(s, height);
bmpdata = 0; bmpdata = 0;
if (flags == 0) /* screen */ if (flags == 0) /* screen */
{ {
@ -1245,7 +1245,7 @@ process_server_paint_rect_shmem_ex(struct mod *amod, struct stream *s)
} }
if (bmpdata != 0) if (bmpdata != 0)
{ {
rv = amod->server_paint_rects(amod, num_drects, ldrects, rv = amod->server_paint_rects(amod, num_drects, ldrects,
num_crects, lcrects, num_crects, lcrects,
bmpdata, width, height, 0); bmpdata, width, height, 0);