Fix merge

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;
     }

sesman/session.c

@@ -452,7 +452,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;
@@ -478,7 +478,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;
     }
@@ -521,7 +521,7 @@ session_start_fork(int width, int height, int bpp, char* username,
   g_memset(text,0,sizeof(char) * 256);
   g_memset(passwd_file,0,sizeof(char) * 256);
 
-log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_start_fork for user %s", username);
+log_message( LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_start_fork for user %s", username);
 
   /* check to limit concurrent sessions */
   if (g_session_count >= g_cfg->sess.max_sessions)
@@ -563,7 +563,7 @@ log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_star
   }
   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;
@@ -610,7 +610,7 @@ log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_star
 
           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);
@@ -690,7 +690,7 @@ log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_star
       else
       {
         g_free(remote_server);
-        log_message(&(g_cfg->log), LOG_LEVEL_ERROR, "another Xserver is "
+        log_message( LOG_LEVEL_ERROR, "another Xserver is "
                     "already active on display %d", display);
       }
       log_message(LOG_LEVEL_DEBUG,"aborting connection...");
@@ -756,7 +756,7 @@ log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_star
 
           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) {
@@ -772,7 +772,7 @@ log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 260.0] In session_star
           }
           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);
           }
@@ -883,7 +883,7 @@ session_start(int width, int height, int bpp, char* username, char* password,
               long data, tui8 type, char* domain, char* program,
               char* directory, char* client_ip)
 {
-log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 258.0] In session_start");
+log_message( LOG_LEVEL_ALWAYS, "[RAJA DEBUG 258.0] In session_start");
   int display;
 
   /* lock mutex */
@@ -938,7 +938,7 @@ session_reconnect(int display, char* username)
 int APP_CC
 session_sync_start(void)
 {
-log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "[RAJA DEBUG 259.0] In session_sync_start");
+log_message( LOG_LEVEL_ALWAYS, "[RAJA DEBUG 259.0] In session_sync_start");
   g_sync_result = session_start_fork(g_sync_width, g_sync_height, g_sync_bpp,
                                      g_sync_username, g_sync_password,
                                      g_sync_data, g_sync_type, g_sync_domain,