diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-06-10 23:47:08 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-06-10 23:47:08 -0700 |
| commit | 856783ba95e46561ee1776a22b03900e7f0e7286 (patch) | |
| tree | 36b1b5a054707b3db3b446fbd13401cf78793f3f /sesman/scp_v1.c | |
| parent | 099a421c7706ea5d7706890d7a3f12a4ccf7c126 (diff) | |
| download | xrdp-proprietary-856783ba95e46561ee1776a22b03900e7f0e7286.tar.gz xrdp-proprietary-856783ba95e46561ee1776a22b03900e7f0e7286.zip | |
no logic changes, remove warnings and coding style changes
Diffstat (limited to 'sesman/scp_v1.c')
| -rw-r--r-- | sesman/scp_v1.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c index d1509224..f93f89ee 100644 --- a/sesman/scp_v1.c +++ b/sesman/scp_v1.c @@ -56,9 +56,11 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s) while ((!data) && ((retries == 0) || (current_try > 0))) { - LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries, current_try, ((!data) && ((retries==0) || (current_try>0)))); + LOG_DBG("data %d - retry %d - currenttry %d - expr %d", + data, retries, current_try, + ((!data) && ((retries == 0) || (current_try > 0)))); - e=scp_v1s_request_password(c,s,"Wrong username and/or password"); + e = scp_v1s_request_password(c, s, "Wrong username and/or password"); switch (e) { @@ -108,7 +110,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s) { /* no disconnected sessions - start a new one */ log_message(LOG_LEVEL_DEBUG,"No disconnected sessions for this user" - "- we create a new one"); + "- we create a new one"); if (0 != s->client_ip) { log_message(LOG_LEVEL_INFO, "++ created session (access granted): username %s, ip %s", s->username, s->client_ip); @@ -159,14 +161,14 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s) case SCP_SERVER_STATE_OK: /* ok, reconnecting... */ sitem=session_get_bypid(sid); - if (0==sitem) + if (0 == sitem) { - e=scp_v1s_connection_error(c, "Internal error"); + e = scp_v1s_connection_error(c, "Internal error"); log_message(LOG_LEVEL_INFO, "Cannot find session item on the chain"); } else { - display=sitem->display; + display = sitem->display; /*e=scp_v1s_reconnect_session(c, sitem, display);*/ e=scp_v1s_reconnect_session(c, display); if (0 != s->client_ip) |