Rename file_loc.h to xrdp_sockets.h, install it

Include xrdp_sockets.h directly, not through headers.

common/Makefile.am

@@ -9,7 +9,8 @@ EXTRA_DIST = pixman-region.c
 include_HEADERS = \
   xrdp_client_info.h \
   xrdp_constants.h \
-  xrdp_rail.h
+  xrdp_rail.h \
+  xrdp_sockets.h
 
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -36,7 +37,6 @@ libcommon_la_SOURCES = \
   fifo.h \
   file.c \
   file.h \
-  file_loc.h \
   list.c \
   list.h \
   list16.c \

common/xrdp_sockets.h

@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * default file locations for log, config, etc
+ * names of UNIX sockets for inter-process communication
  */
 
-#if !defined(FILE_LOC_H)
-#define FILE_LOC_H
+#if !defined(XRDP_SOCKETS_H)
+#define XRDP_SOCKETS_H
 
 #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"

libxrdp/libxrdp.h

@@ -31,7 +31,6 @@
 #include "list.h"
 #include "file.h"
 #include "libxrdpinc.h"
-#include "file_loc.h"
 #include "xrdp_client_info.h"
 
 

sesman/chansrv/chansrv.c

@@ -32,12 +32,12 @@
 #include "devredir.h"
 #include "list.h"
 #include "file.h"
-#include "file_loc.h"
 #include "log.h"
 #include "rail.h"
 #include "xcommon.h"
 #include "chansrv_fuse.h"
 #include "drdynvc.h"
+#include "xrdp_sockets.h"
 
 static struct trans *g_lis_trans = 0;
 static struct trans *g_con_trans = 0;

sesman/chansrv/pulse/module-xrdp-sink.c

@@ -68,7 +68,7 @@ typedef bool pa_bool_t;
 #endif
 
 #include "module-xrdp-sink-symdef.h"
-#include "../../../common/file_loc.h"
+#include "../../../common/xrdp_sockets.h"
 
 PA_MODULE_AUTHOR("Jay Sorg");
 PA_MODULE_DESCRIPTION("xrdp sink");

sesman/chansrv/pulse/module-xrdp-source.c

@@ -55,7 +55,7 @@ typedef bool pa_bool_t;
 #endif
 
 #include "module-xrdp-source-symdef.h"
-#include "../../../common/file_loc.h"
+#include "../../../common/xrdp_sockets.h"
 
 PA_MODULE_AUTHOR("Laxmikant Rashinkar");
 PA_MODULE_DESCRIPTION("xrdp source");

sesman/chansrv/sound.c

@@ -31,7 +31,7 @@
 #include "thread_calls.h"
 #include "defines.h"
 #include "fifo.h"
-#include "file_loc.h"
+#include "xrdp_sockets.h"
 #include "chansrv_common.h"
 
 #if defined(XRDP_OPUS)

sesman/sesman.h

@@ -31,7 +31,6 @@
 #include "parse.h"
 #include "os_calls.h"
 #include "log.h"
-#include "file_loc.h"
 #include "env.h"
 #include "auth.h"
 #include "config.h"

sesman/session.c

@@ -40,6 +40,7 @@
 #include "sesman.h"
 #include "libscp_types.h"
 #include "xauth.h"
+#include "xrdp_sockets.h"
 
 #ifndef PR_SET_NO_NEW_PRIVS
 #define PR_SET_NO_NEW_PRIVS 38

sesman/tools/dis.c

@@ -27,7 +27,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "file_loc.h"
+#include "xrdp_sockets.h"
 
 int main(int argc, char **argv)
 {

xrdp/xrdp.h

@@ -32,7 +32,6 @@
 #include "ssl_calls.h"
 #include "thread_calls.h"
 #include "file.h"
-#include "file_loc.h"
 #include "xrdp_client_info.h"
 #include "log.h"
 

xrdp/xrdp_mm.c

@@ -35,6 +35,7 @@
 #endif /* USE_NOPAM */
 
 #include "xrdp_encoder.h"
+#include "xrdp_sockets.h"
 
 #define LLOG_LEVEL 1
 #define LLOGLN(_level, _args) \

xrdpapi/xrdpapi.c

@@ -39,7 +39,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "file_loc.h"
+#include "xrdp_sockets.h"
 #include "xrdpapi.h"
 
 struct wts_obj