uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix merge

Browse Source
ulab-next
Timothy Pearson 12 years ago committed by Timothy Pearson
parent 65545da459
commit 8da3a3f7cb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
sesman/scp_v0.c
Unescape View File

@ -83,7 +83,7 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
if (serverpid < 0) { if (serverpid < 0) {
// Session NOT already running // Session NOT already running
if (s_item != 0) { if (s_item != 0) {
log_message(&(g_cfg->log), LOG_LEVEL_INFO, "++ [FIXME] scp claimed there was an active session, but the authoritative RAPTOR database disagrees: username %s", s->username); log_message( LOG_LEVEL_INFO, "++ [FIXME] scp claimed there was an active session, but the authoritative RAPTOR database disagrees: username %s", s->username);
} }
s_item = 0; s_item = 0;
} }

12
sesman/session.c
Unescape View File

@ -508,7 +508,7 @@ wait_for_remote_xserver(const char* host, int display)
i++; i++;
if (i > 60) if (i > 60)
{ {
log_message(&(g_cfg->log), LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR,
"X server for host %s and display %d startup timeout", "X server for host %s and display %d startup timeout",
host, display); host, display);
break; break;
@ -534,7 +534,7 @@ wait_for_remote_hostname(char* username)
i++; i++;
if (i > 20) if (i > 20)
{ {
log_message(&(g_cfg->log), LOG_LEVEL_ERROR, log_message(LOG_LEVEL_ERROR,
"Hostname allocation timeout"); "Hostname allocation timeout");
break; break;
} }
@ -623,7 +623,7 @@ session_start_fork(int width, int height, int bpp, char *username,
if (display == 0) if (display == 0)
{ {
log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "Unable to allocate display for user %s", username); log_message(LOG_LEVEL_ALWAYS, "Unable to allocate display for user %s", username);
g_free(temp->item); g_free(temp->item);
g_free(temp); g_free(temp);
return 0; return 0;
@ -682,7 +682,7 @@ session_start_fork(int width, int height, int bpp, char *username,
pid_t wmpid; pid_t wmpid;
wmpid = raptor_sm_run_remote_server(username, pp2, RAPTOR_SM_WM_PID_FIELD, display); wmpid = raptor_sm_run_remote_server(username, pp2, RAPTOR_SM_WM_PID_FIELD, display);
log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "new window manager pid code was %d for user %s", wmpid, username); log_message(LOG_LEVEL_ALWAYS, "new window manager pid code was %d for user %s", wmpid, username);
if (wmpid >= 0) { if (wmpid >= 0) {
raptor_sm_wm_started(username, wmpid, RAPTOR_SM_WM_PID_FIELD); raptor_sm_wm_started(username, wmpid, RAPTOR_SM_WM_PID_FIELD);
@ -880,7 +880,7 @@ session_start_fork(int width, int height, int bpp, char *username,
pid_t serverpid; pid_t serverpid;
serverpid = raptor_sm_run_remote_server(username, pp1, RAPTOR_SM_SERVER_PID_FIELD, -1); serverpid = raptor_sm_run_remote_server(username, pp1, RAPTOR_SM_SERVER_PID_FIELD, -1);
log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "new server pid code was %d during login for user %s", serverpid, username); log_message(LOG_LEVEL_ALWAYS, "new server pid code was %d during login for user %s", serverpid, username);
if (serverpid >= 0) { if (serverpid >= 0) {
if (!session_was_already_running) { if (!session_was_already_running) {
@ -896,7 +896,7 @@ session_start_fork(int width, int height, int bpp, char *username,
} }
else { else {
raptor_sm_session_terminated(username); raptor_sm_session_terminated(username);
log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "max concurrent session limit " log_message(LOG_LEVEL_ALWAYS, "max concurrent session limit "
"exceeded in group. login for user %s denied", username); "exceeded in group. login for user %s denied", username);
g_exit(1); g_exit(1);
} }

Write Preview
Loading…
Cancel
Save