From 58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 14 Mar 2017 21:45:50 -0700 Subject: Make socket directory configurable, don't hardcode /tmp/.xrdp Use XRDP_SOCKET_PATH in file_loc.h Don't define any non-socket paths in file_loc.h, they should come from the makefiles. Define all paths unconditionally, they should not be defined elsewhere. Pass XRDP_SOCKET_PATH as environment variable to the backends. --- common/file_loc.h | 49 ++++++------------------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'common/file_loc.h') diff --git a/common/file_loc.h b/common/file_loc.h index 8f5146cb..45178964 100644 --- a/common/file_loc.h +++ b/common/file_loc.h @@ -21,48 +21,11 @@ #if !defined(FILE_LOC_H) #define FILE_LOC_H -#if !defined(XRDP_CFG_PATH) -#define XRDP_CFG_PATH "/etc/xrdp" -#endif - -#if !defined(XRDP_PID_PATH) -#define XRDP_PID_PATH "/var/run" -#endif - -#if !defined(XRDP_SBIN_PATH) -#define XRDP_SBIN_PATH "/usr/local/sbin" -#endif - -#if !defined(XRDP_SHARE_PATH) -#define XRDP_SHARE_PATH "/usr/local/share/xrdp" -#endif - -#if !defined(XRDP_MODULE_PATH) -#define XRDP_MODULE_PATH "/usr/local/lib/xrdp" -#endif - -#if !defined(XRDP_LOG_PATH) -#define XRDP_LOG_PATH "/var/log" -#endif - -#if !defined(XRDP_CHANSRV_STR) -#define XRDP_CHANSRV_STR "/tmp/.xrdp/xrdp_chansrv_socket_%d" -#endif - -#if !defined(CHANSRV_PORT_OUT_STR) -#define CHANSRV_PORT_OUT_STR "/tmp/.xrdp/xrdp_chansrv_audio_out_socket_%d" -#endif - -#if !defined(CHANSRV_PORT_IN_STR) -#define CHANSRV_PORT_IN_STR "/tmp/.xrdp/xrdp_chansrv_audio_in_socket_%d" -#endif - -#if !defined(CHANSRV_API_STR) -#define CHANSRV_API_STR "/tmp/.xrdp/xrdpapi_%d" -#endif - -#if !defined(XRDP_X11RDP_STR) -#define XRDP_X11RDP_STR "/tmp/.xrdp/xrdp_display_%d" -#endif +#define XRDP_CHANSRV_STR XRDP_SOCKET_PATH "/xrdp_chansrv_socket_%d" +#define CHANSRV_PORT_OUT_STR XRDP_SOCKET_PATH "/xrdp_chansrv_audio_out_socket_%d" +#define CHANSRV_PORT_IN_STR XRDP_SOCKET_PATH "/xrdp_chansrv_audio_in_socket_%d" +#define CHANSRV_API_STR XRDP_SOCKET_PATH "/xrdpapi_%d" +#define XRDP_X11RDP_STR XRDP_SOCKET_PATH "/xrdp_display_%d" +#define XRDP_DISCONNECT_STR XRDP_SOCKET_PATH "/xrdp_disconnect_display_%d" #endif -- cgit v1.2.3