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

xrdp: use full path for loading xrdp modules

Browse Source
This commit is contained in:
Jay Sorg 2013-05-01 22:26:34 -07:00
parent be44e0be4b
commit 19a9ed47dc
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/file_loc.h
View File

@ -37,4 +37,8 @@
#define XRDP_SHARE_PATH "/usr/local/share/xrdp"
#endif
#if !defined(XRDP_LIB_PATH)
#define XRDP_LIB_PATH "/usr/local/lib/xrdp"
#endif
#endif

1
xrdp/Makefile.am
View File

@ -11,6 +11,7 @@ AM_CFLAGS = \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_LIB_PATH=\"${libdir}\" \
$(EXTRA_DEFINES)
INCLUDES = \

1
xrdp/xrdp.ini
View File

@ -63,6 +63,7 @@ password=ask
ip=127.0.0.1
port=-1
xserverbpp=24
code=10
[xrdp2]
name=sesman-Xvnc

13
xrdp/xrdp_mm.c
View File

@ -17,6 +17,7 @@
*
* module manager
*/
#include <config_ac.h>
#define ACCESS
#include "xrdp.h"
@ -148,13 +149,10 @@ xrdp_mm_send_login(struct xrdp_mm *self)
{
password = value;
}
else if (g_strcasecmp(name, "lib") == 0)
else if (g_strcasecmp(name, "code") == 0)
{
if ((g_strcasecmp(value, "libxup.so") == 0) ||
(g_strcasecmp(value, "xup.dll") == 0))
{
self->code = 10;
}
/* this code is either 0 for Xvnc or 10 for X11rdp */
self->code = g_atoi(value);
}
else if (g_strcasecmp(name, "xserverbpp") == 0)
{
@ -311,8 +309,9 @@ xrdp_mm_setup_mod1(struct xrdp_mm *self)
if (self->mod_handle == 0)
{
g_snprintf(text, 255, "%s/%s", XRDP_LIB_PATH, lib);
/* Let the main thread load the lib,*/
self->mod_handle = g_xrdp_sync(xrdp_mm_sync_load, (long)lib, 0);
self->mod_handle = g_xrdp_sync(xrdp_mm_sync_load, (tintptr)text, 0);
if (self->mod_handle != 0)
{