|
0 |
Put Unix sockets in /var/run/xrdp.
|
|
1 |
|
|
2 |
Closes: #656210
|
|
3 |
diff --git a/common/os_calls.c b/common/os_calls.c
|
|
4 |
index ceb581d..65d695a 100644
|
|
5 |
--- a/common/os_calls.c
|
|
6 |
+++ b/common/os_calls.c
|
|
7 |
@@ -664,16 +664,16 @@ g_create_wait_obj(char* name)
|
|
8 |
if ((name == 0) || (strlen(name) == 0))
|
|
9 |
{
|
|
10 |
g_random((char*)&i, sizeof(i));
|
|
11 |
- sprintf(sa.sun_path, "/tmp/auto%8.8x", i);
|
|
12 |
+ sprintf(sa.sun_path, "/var/run/xrdp/auto%8.8x", i);
|
|
13 |
while (g_file_exist(sa.sun_path))
|
|
14 |
{
|
|
15 |
g_random((char*)&i, sizeof(i));
|
|
16 |
- sprintf(sa.sun_path, "/tmp/auto%8.8x", i);
|
|
17 |
+ sprintf(sa.sun_path, "/var/run/xrdp/auto%8.8x", i);
|
|
18 |
}
|
|
19 |
}
|
|
20 |
else
|
|
21 |
{
|
|
22 |
- sprintf(sa.sun_path, "/tmp/%s", name);
|
|
23 |
+ sprintf(sa.sun_path, "/var/run/xrdp/%s", name);
|
|
24 |
}
|
|
25 |
unlink(sa.sun_path);
|
|
26 |
len = sizeof(sa);
|
|
27 |
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
|
|
28 |
index ed1400f..bd9c426 100644
|
|
29 |
--- a/sesman/chansrv/chansrv.c
|
|
30 |
+++ b/sesman/chansrv/chansrv.c
|
|
31 |
@@ -409,7 +409,7 @@ setup_listen(void)
|
|
32 |
if (g_use_unix_socket)
|
|
33 |
{
|
|
34 |
g_lis_trans = trans_create(2, 8192, 8192);
|
|
35 |
- g_snprintf(port, 255, "/tmp/xrdp_chansrv_socket_%d", 7200 + g_display_num);
|
|
36 |
+ g_snprintf(port, 255, "/var/run/xrdp/xrdp_chansrv_socket_%d", 7200 + g_display_num);
|
|
37 |
}
|
|
38 |
else
|
|
39 |
{
|
|
40 |
diff --git a/sesman/sessvc/sessvc.c b/sesman/sessvc/sessvc.c
|
|
41 |
index be84f9d..28d0183 100644
|
|
42 |
--- a/sesman/sessvc/sessvc.c
|
|
43 |
+++ b/sesman/sessvc/sessvc.c
|
|
44 |
@@ -56,12 +56,12 @@ chansrv_cleanup(int pid)
|
|
45 |
{
|
|
46 |
char text[256];
|
|
47 |
|
|
48 |
- g_snprintf(text, 255, "/tmp/xrdp_chansrv_%8.8x_main_term", pid);
|
|
49 |
+ g_snprintf(text, 255, "/var/run/xrdp/xrdp_chansrv_%8.8x_main_term", pid);
|
|
50 |
if (g_file_exist(text))
|
|
51 |
{
|
|
52 |
g_file_delete(text);
|
|
53 |
}
|
|
54 |
- g_snprintf(text, 255, "/tmp/xrdp_chansrv_%8.8x_thread_done", pid);
|
|
55 |
+ g_snprintf(text, 255, "/var/run/xrdp/xrdp_chansrv_%8.8x_thread_done", pid);
|
|
56 |
if (g_file_exist(text))
|
|
57 |
{
|
|
58 |
g_file_delete(text);
|
|
59 |
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
|
|
60 |
index f332776..a12b534 100644
|
|
61 |
--- a/xrdp/xrdp_mm.c
|
|
62 |
+++ b/xrdp/xrdp_mm.c
|
|
63 |
@@ -661,7 +661,7 @@ xrdp_mm_process_login_response(struct xrdp_mm* self, struct stream* s)
|
|
64 |
{
|
|
65 |
/* unix socket */
|
|
66 |
self->chan_trans = trans_create(2, 8192, 8192);
|
|
67 |
- g_snprintf(port, 255, "/tmp/xrdp_chansrv_socket_%d", 7200 + display);
|
|
68 |
+ g_snprintf(port, 255, "/var/run/xrdp/xrdp_chansrv_socket_%d", 7200 + display);
|
|
69 |
}
|
|
70 |
else
|
|
71 |
{
|