1 files changed, 60 insertions, 17 deletions

diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index ccebd8d3..83d2f0a2 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -48,6 +48,7 @@ g_xrdp_sync(long (*sync_func)(long param1, long param2), long sync_param1,
   if (tc_threadid_equal(tc_get_threadid(), g_threadid))
   {
     /* this is the main thread, call the function directly */
+    /* in fork mode, this always happens too */
     sync_result = sync_func(sync_param1, sync_param2);
   }
   else
@@ -90,6 +91,32 @@ xrdp_shutdown(int sig)
 }
 
 /*****************************************************************************/
+void DEFAULT_CC
+xrdp_child(int sig)
+{
+  g_waitchild();
+}
+
+/*****************************************************************************/
+/* called in child just after fork */
+int APP_CC
+xrdp_child_fork(void)
+{
+  int pid;
+  char text[256];
+
+  /* close, don't delete these */
+  g_close_wait_obj(g_term_event);
+  g_close_wait_obj(g_sync_event);
+  pid = g_getpid();
+  g_snprintf(text, 255, "xrdp_%8.8x_main_term", pid);
+  g_term_event = g_create_wait_obj(text);
+  g_snprintf(text, 255, "xrdp_%8.8x_main_sync", pid);
+  g_sync_event = g_create_wait_obj(text);
+  return 0;
+}
+
+/*****************************************************************************/
 int APP_CC
 g_is_term(void)
 {
@@ -214,6 +241,12 @@ xrdp_process_params(int argc, char** argv,
                   startup_params->port);
       }
     }
+    else if ((g_strncasecmp(option, "-f", 255) == 0) ||
+             (g_strncasecmp(option, "--fork", 255) == 0))
+    {
+      startup_params->fork = 1;
+      g_writeln("--fork parameter found, ini override");
+    }
     else
     {
       return 1;
@@ -319,7 +352,7 @@ main(int argc, char** argv)
     }
     if (fd == -1)
     {
-      g_writeln("problem opening to xrdp.pid");
+      g_writeln("problem opening to xrdp.pid [%s]", pid_file);
       g_writeln("maybe its not running");
     }
     else
@@ -349,9 +382,11 @@ main(int argc, char** argv)
     g_writeln("See http://xrdp.sourceforge.net for more information.");
     g_writeln("");
     g_writeln("Usage: xrdp [options]");
-    g_writeln("   -h: show help");
-    g_writeln("   -nodaemon: don't fork into background");
-    g_writeln("   -kill: shut down xrdp");
+    g_writeln("   --help: show help");
+    g_writeln("   --nodaemon: don't fork into background");
+    g_writeln("   --kill: shut down xrdp");
+    g_writeln("   --port: tcp listen port");
+    g_writeln("   --fork: fork on new connection");
     g_writeln("");
     g_deinit();
     g_exit(0);
@@ -376,6 +411,10 @@ main(int argc, char** argv)
   }
   if (!no_daemon)
   {
+
+    /* make sure containing directory exists */
+    g_create_path(pid_file);
+
     /* make sure we can write to pid file */
     fd = g_file_open(pid_file); /* xrdp.pid */
     if (fd == -1)
@@ -411,16 +450,6 @@ main(int argc, char** argv)
       g_exit(0);
     }
     g_sleep(1000);
-    g_file_close(0);
-    g_file_close(1);
-    g_file_close(2);
-    g_file_open("/dev/null");
-    g_file_open("/dev/null");
-    g_file_open("/dev/null");
-    /* end of daemonizing code */
-  }
-  if (!no_daemon)
-  {
     /* write the pid to file */
     pid = g_getpid();
     fd = g_file_open(pid_file); /* xrdp.pid */
@@ -436,6 +465,14 @@ main(int argc, char** argv)
       g_file_write(fd, text, g_strlen(text));
       g_file_close(fd);
     }
+    g_sleep(1000);
+    g_file_close(0);
+    g_file_close(1);
+    g_file_close(2);
+    g_file_open("/dev/null");
+    g_file_open("/dev/null");
+    g_file_open("/dev/null");
+    /* end of daemonizing code */
   }
   g_threadid = tc_get_threadid();
   g_listen = xrdp_listen_create();
@@ -443,6 +480,7 @@ main(int argc, char** argv)
   g_signal_kill(xrdp_shutdown); /* SIGKILL */
   g_signal_pipe(pipe_sig); /* SIGPIPE */
   g_signal_terminate(xrdp_shutdown); /* SIGTERM */
+  g_signal_child_stop(xrdp_child); /* SIGCHLD */
   g_sync_mutex = tc_mutex_create();
   g_sync1_mutex = tc_mutex_create();
   pid = g_getpid();
@@ -454,14 +492,19 @@ main(int argc, char** argv)
   {
     g_writeln("error creating g_term_event");
   }
-  xrdp_listen_main_loop(g_listen, startup_params);
+  g_listen->startup_params = startup_params;
+  xrdp_listen_main_loop(g_listen);
   xrdp_listen_delete(g_listen);
   tc_mutex_delete(g_sync_mutex);
   tc_mutex_delete(g_sync1_mutex);
   g_delete_wait_obj(g_term_event);
   g_delete_wait_obj(g_sync_event);
-  /* delete the xrdp.pid file */
-  g_file_delete(pid_file);
+  /* only main process should delete pid file */
+  if ((!no_daemon) && (pid == g_getpid()))
+  {
+    /* delete the xrdp.pid file */
+    g_file_delete(pid_file);
+  }
   g_free(startup_params);
   g_deinit();
   return 0;