diff options
| author | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-02 20:31:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-02 20:31:22 -0600 |
| commit | 2570846cbedb2f82988fb1768423c852b794f9f0 (patch) | |
| tree | 0d56c58af00a11cdda63df38c498436ccec15858 | |
| parent | 6f37be1294632c25cf37a03fae6be6772ba95351 (diff) | |
| download | xrdp-proprietary-2570846cbedb2f82988fb1768423c852b794f9f0.tar.gz xrdp-proprietary-2570846cbedb2f82988fb1768423c852b794f9f0.zip | |
Fix non-root-user display server startup failure
| -rw-r--r-- | sesman/env.c | 2 | ||||
| -rw-r--r-- | xrdp/xrdp_login_wnd.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sesman/env.c b/sesman/env.c index b097f38c..8a11f818 100644 --- 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); diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index c09f8002..d310572f 100644 --- 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 |