summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-11-11 20:06:04 -0800
committerJay Sorg <jay.sorg@gmail.com>2014-11-11 20:06:04 -0800
commit942cdf300edaed7fee13a78e5e1c9b9c3d9c923e (patch)
treecd29449f628c1627786be36be67969aca37e6b1d
parent253f6ff555120e0553ccea542faeae95f17d5639 (diff)
downloadxrdp-proprietary-942cdf300edaed7fee13a78e5e1c9b9c3d9c923e.tar.gz
xrdp-proprietary-942cdf300edaed7fee13a78e5e1c9b9c3d9c923e.zip
sesman: avoid creation of .vnc directory if not vnc session
-rw-r--r--sesman/session.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sesman/session.c b/sesman/session.c
index 755b57bc..4ea48d35 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -460,6 +460,7 @@ session_start_fork(int width, int height, int bpp, char *username,
char screen[32];
char text[256];
char passwd_file[256];
+ char *pfile;
char **pp1 = (char **)NULL;
struct session_chain *temp = (struct session_chain *)NULL;
struct list *xserver_params = (struct list *)NULL;
@@ -633,7 +634,12 @@ session_start_fork(int width, int height, int bpp, char *username,
}
else if (xpid == 0) /* child */
{
- env_set_user(username, passwd_file, display,
+ pfile = 0;
+ if (type == SESMAN_SESSION_TYPE_XVNC)
+ {
+ pfile = passwd_file;
+ }
+ env_set_user(username, pfile, display,
g_cfg->session_variables1,
g_cfg->session_variables2);