jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'devel' into v0.9

Browse Source
This commit is contained in:
Koichiro IWAO 2017-07-14 21:40:31 +09:00
commit c222335be9
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -8,7 +8,7 @@
* Now sesman ensures socket directory present #801
* Exit with failure status if port already in use #644
* Eliminate some hard coded paths
* Fix a glitch with IPv4 struct initialization #803
* Fix glitches with IPv4 struct initialization #803
* Fix some keyboard layout integration (UK, Spanish)
* Fix handle OS when IPv6 disabled #714
* Fix issues around systemd session #778

18
common/os_calls.c
View File

@ -109,17 +109,17 @@ g_rm_temp_dir(void)
/*****************************************************************************/
int
g_mk_temp_dir(const char *app_name)
g_mk_socket_path(const char *app_name)
{
if (!g_directory_exist(XRDP_SOCKET_PATH))
{
if (!g_create_dir(XRDP_SOCKET_PATH))
if (!g_create_path(XRDP_SOCKET_PATH))
{
/* if failed, still check if it got created by someone else */
if (!g_directory_exist(XRDP_SOCKET_PATH))
{
log_message(LOG_LEVEL_ERROR,
"g_mk_temp_dir: g_create_dir(%s) failed",
"g_mk_socket_path: g_create_path(%s) failed",
XRDP_SOCKET_PATH);
return 1;
}
@ -153,7 +153,7 @@ g_init(const char *app_name)
setlocale(LC_CTYPE, "en_US.UTF-8");
}
g_mk_temp_dir(app_name);
g_mk_socket_path(app_name);
}
/*****************************************************************************/
@ -753,7 +753,7 @@ connect_loopback(int sck, const char *port)
}
// else IPv4
g_memset(&sa, 0, sizeof(s));
g_memset(&s, 0, sizeof(s));
s.sin_family = AF_INET;
s.sin_addr.s_addr = htonl(INADDR_LOOPBACK); // IPv4 127.0.0.1
s.sin_port = htons((tui16)atoi(port));
@ -944,7 +944,7 @@ g_tcp_bind(int sck, const char *port)
errno6 = errno;
// else IPv4
g_memset(&sa, 0, sizeof(s));
g_memset(&s, 0, sizeof(s));
s.sin_family = AF_INET;
s.sin_addr.s_addr = htonl(INADDR_ANY); // IPv4 0.0.0.0
s.sin_port = htons((tui16)atoi(port));
@ -2954,7 +2954,7 @@ g_execvp(const char *p1, char *args[])
g_rm_temp_dir();
rv = execvp(p1, args);
g_mk_temp_dir(0);
g_mk_socket_path(0);
return rv;
#endif
}
@ -2971,7 +2971,7 @@ g_execlp3(const char *a1, const char *a2, const char *a3)
g_rm_temp_dir();
rv = execlp(a1, a2, a3, (void *)0);
g_mk_temp_dir(0);
g_mk_socket_path(0);
return rv;
#endif
}
@ -3067,7 +3067,7 @@ g_fork(void)
if (rv == 0) /* child */
{
g_mk_temp_dir(0);
g_mk_socket_path(0);
}
return rv;

2
common/os_calls.h
View File

@ -38,7 +38,7 @@
#define g_close_wait_obj g_delete_wait_obj
int g_rm_temp_dir(void);
int g_mk_temp_dir(const char* app_name);
int g_mk_socket_path(const char* app_name);
void g_init(const char* app_name);
void g_deinit(void);
void* g_malloc(int size, int zero);

4
sesman/env.c
View File

@ -69,7 +69,7 @@ env_check_password_file(const char *filename, const char *passwd)
g_strncpy(encryptedPasswd, passwd, 8);
g_memset(key, 0, sizeof(key));
g_mirror_memcpy(key, g_fixedkey, 8);
des = ssl_des3_encrypt_info_create(key, 0);
des = ssl_des3_encrypt_info_create(key, 0);
ssl_des3_encrypt(des, 8, encryptedPasswd, encryptedPasswd);
ssl_des3_info_delete(des);
fd = g_file_open_ex(filename, 0, 1, 1, 1);
@ -124,7 +124,7 @@ env_set_user(const char *username, char **passwd_file, int display,
error = g_setuid(uid);
}
g_mk_temp_dir(0);
g_mk_socket_path(0);
if (error == 0)
{

2
sesman/sesman.c
View File

@ -418,7 +418,7 @@ main(int argc, char **argv)
"starting xrdp-sesman with pid %d", g_pid);
/* make sure the socket directory exists */
g_mk_temp_dir("xrdp-sesman");
g_mk_socket_path("xrdp-sesman");
/* make sure the /tmp/.X11-unix directory exists */
if (!g_directory_exist("/tmp/.X11-unix"))