Fix merge

1 files changed, 3 insertions, 2 deletions

diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index 092585cf..330c8124 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -40,7 +40,8 @@ scp_v0_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   struct session_item* s_item;
 
   data = auth_userpass(s->username, s->password);
-  if (s->type == SCP_GW_AUTHENTICATION)
+
+  if (data)
   {
     s_item = session_get_bydata(s->username, s->width, s->height, s->bpp, s->type);
 
@@ -49,7 +50,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;
     }