Fix non-root-user display server startup failure

6 years ago · 2570846cbe
parent 6f37be1294
commit 2570846cbe
2 changed files with 3 additions and 2 deletions
--- a/sesman/env.c
+++ b/sesman/env.c
@ -123,7 +123,7 @@ env_set_user(const char *username, char **passwd_file, int display,
        if (error == 0)
        {
            uid = pw_uid;
-            error = g_setuid(uid);
+//            error = g_setuid(uid);
        }

        g_mk_socket_path(0);
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@ -589,7 +589,8 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm *self, struct xrdp_bitmap *b)

        if ((g_strncasecmp(p, "globals", 255) == 0)
                || (g_strncasecmp(p, "channels", 255) == 0)
-                || (g_strncasecmp(p, "Logging", 255) == 0))
+                || (g_strncasecmp(p, "Logging", 255) == 0)
+                || (g_strncasecmp(p, "Database", 255) == 0))
        {
        }
        else