From cc48345f40090bee15f304e54e4a116f5d7324d8 Mon Sep 17 00:00:00 2001
From: metalefty <meta@vmeta.jp>
Date: Sat, 28 Jan 2017 21:14:55 +0900
Subject: [PATCH] sesman: remove unnecessary fork for FreeBSD (#650)

it is not only unnecessary but causes another bug.
---
 sesman/session.c | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/sesman/session.c b/sesman/session.c
index a672e93e..78d9ae9f 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -513,32 +513,23 @@ session_start_fork(tbus data, tui8 type, struct SCP_SESSION *s)
          *  $OpenBSD: session.c,v 1.252 2010/03/07 11:57:13 dtucker Exp $
          *  with some ideas about BSD process grouping to xrdp
          */
-        pid_t bsdsespid = g_fork();
 
-        if (bsdsespid == -1)
+        /**
+         * Create a new session and process group since the 4.4BSD
+         * setlogin() affects the entire process group
+         */
+        if (g_setsid() < 0)
         {
-        }
-        else if (bsdsespid == 0) /* BSD session leader */
-        {
-            /**
-             * Create a new session and process group since the 4.4BSD
-             * setlogin() affects the entire process group
-             */
-            if (g_setsid() < 0)
-            {
-                log_message(LOG_LEVEL_ERROR,
-                            "setsid failed - pid %d", g_getpid());
-            }
-
-            if (g_setlogin(s->username) < 0)
-            {
-                log_message(LOG_LEVEL_ERROR,
-                            "setlogin failed for user %s - pid %d", s->username,
-                            g_getpid());
-            }
+            log_message(LOG_LEVEL_ERROR,
+                        "setsid failed - pid %d", g_getpid());
         }
 
-        g_waitpid(bsdsespid);
+        if (g_setlogin(s->username) < 0)
+        {
+            log_message(LOG_LEVEL_ERROR,
+                        "setlogin failed for user %s - pid %d", s->username,
+                        g_getpid());
+        }
 #endif
         wmpid = g_fork(); /* parent becomes X,
                              child forks wm, and waits, todo */