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

Moved bin/xrdp-waitforx to libexec/xrdp/waitforx

Browse Source
This commit is contained in:
matt335672
2023-03-09 10:35:44 +00:00
parent eeaa803948
commit 3681ecdf23
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sesman/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
-DXRDP_SYSCONF_PATH=\"${sysconfdir}\" \ -DXRDP_SYSCONF_PATH=\"${sysconfdir}\" \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_BIN_PATH=\"${bindir}\" \ -DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_SOCKET_PATH=\"${socketdir}\" \ -DXRDP_SOCKET_PATH=\"${socketdir}\" \
sesman/xwait.c
+3 -3
View File
@@ -21,11 +21,11 @@ wait_for_xserver(int display)
LOG(LOG_LEVEL_DEBUG, "Waiting for X server to start on display %d", display); LOG(LOG_LEVEL_DEBUG, "Waiting for X server to start on display %d", display);
g_snprintf(exe_cmd, sizeof(exe_cmd), "%s/xrdp-waitforx", XRDP_BIN_PATH); g_snprintf(exe_cmd, sizeof(exe_cmd), "%s/waitforx", XRDP_LIBEXEC_PATH);
dp = popen(exe_cmd, "r"); dp = popen(exe_cmd, "r");
if (dp == NULL) if (dp == NULL)
{ {
LOG(LOG_LEVEL_ERROR, "Unable to launch xrdp-waitforx"); LOG(LOG_LEVEL_ERROR, "Unable to launch waitforx");
return 1; return 1;
} }
@@ -38,7 +38,7 @@ wait_for_xserver(int display)
ret = pclose(dp); ret = pclose(dp);
if (ret != 0) if (ret != 0)
{ {
LOG(LOG_LEVEL_ERROR, "An error occurred while running xrdp-waitforx"); LOG(LOG_LEVEL_ERROR, "An error occurred while running waitforx");
return 0; return 0;
} }
waitforx/Makefile.am
+4 -4
View File
@@ -1,5 +1,5 @@
bin_PROGRAMS = \ pkglibexec_PROGRAMS = \
xrdp-waitforx waitforx
AM_LDFLAGS = -lX11 -lXrandr AM_LDFLAGS = -lX11 -lXrandr
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/common
AM_CFLAGS = $(X_CFLAGS) AM_CFLAGS = $(X_CFLAGS)
xrdp_waitforx_SOURCES = waitforx.c waitforx_SOURCES = waitforx.c
xrdp_waitforx_LDADD = \ waitforx_LDADD = \
$(top_builddir)/common/libcommon.la $(top_builddir)/common/libcommon.la