diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-20 01:11:48 -0500 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-17 00:34:02 -0500 |
| commit | a3c2cb3bb2596f6461a317fce9fc87b47c596d2f (patch) | |
| tree | 8a74a6be97e6116ed95276adc7c389895b602087 | |
| parent | 0607f42f478058e73065b253ba02df9588da4745 (diff) | |
| download | xrdp-proprietary-a3c2cb3bb2596f6461a317fce9fc87b47c596d2f.tar.gz xrdp-proprietary-a3c2cb3bb2596f6461a317fce9fc87b47c596d2f.zip | |
Fix merge
| -rw-r--r-- | sesman/scp_v0.c | 2 | ||||
| -rw-r--r-- | sesman/session.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c index b6206f3e..81de47ec 100644 --- a/sesman/scp_v0.c +++ b/sesman/scp_v0.c @@ -83,7 +83,7 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) if (serverpid < 0) { // Session NOT already running 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; } diff --git a/sesman/session.c b/sesman/session.c index 83ae22ae..3a435985 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -504,7 +504,7 @@ wait_for_remote_xserver(const char* host, int display) i++; 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", host, display); break; @@ -530,7 +530,7 @@ wait_for_remote_hostname(char* username) i++; if (i > 20) { - log_message(&(g_cfg->log), LOG_LEVEL_ERROR, + log_message(LOG_LEVEL_ERROR, "Hostname allocation timeout"); break; } @@ -621,7 +621,7 @@ session_start_fork(int width, int height, int bpp, char *username, 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); return 0; @@ -720,7 +720,7 @@ session_start_fork(int width, int height, int bpp, char *username, pid_t wmpid; 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) { raptor_sm_wm_started(username, wmpid, RAPTOR_SM_WM_PID_FIELD); @@ -935,7 +935,7 @@ session_start_fork(int width, int height, int bpp, char *username, pid_t serverpid; 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 (!session_was_already_running) { @@ -951,7 +951,7 @@ session_start_fork(int width, int height, int bpp, char *username, } else { 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); g_exit(1); } |