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

Merge pull request #359 from metalefty/sesman/configurable-xserver-path

Browse Source 
sesman: do not hardcode Xorg/X11rdp/Xvnc executables
This commit is contained in:
jsorg71 2016-04-18 13:29:15 -07:00
commit 00a11f77ce
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sesman/config.h
View File

@ -220,16 +220,14 @@ struct config_sesman
*/
struct list* rdp_params;
/**
* @var log
* @brief Log configuration struct
* @var xorg_params
* @brief Xorg additional parameter list
*/
struct list* xorg_params;
/**
* @var log
* @brief Log configuration struct
*/
//struct log_config log;
/**
* @var sec

3
sesman/sesman.ini
View File

@ -63,6 +63,7 @@ EnableSyslog=1
SyslogLevel=DEBUG
[X11rdp]
param0=X11rdp
param1=-bs
param2=-ac
param3=-nolisten
@ -70,6 +71,7 @@ param4=tcp
param5=-uds
[Xvnc]
param0=Xvnc
param1=-bs
param2=-ac
param3=-nolisten
@ -79,6 +81,7 @@ param6=-dpi
param7=96
[Xorg]
param0=Xorg
param1=-config
param2=xrdp/xorg.conf
param3=-logfile

27
sesman/session.c
View File

@ -412,9 +412,10 @@ session_start_fork(int width, int height, int bpp, char *username,
int pampid = 0;
int xpid = 0;
int i = 0;
char **xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */
char geometry[32];
char depth[32];
char screen[32];
char screen[32]; /* display number */
char text[256];
char passwd_file[256];
char *pfile;
@ -652,8 +653,12 @@ session_start_fork(int width, int height, int bpp, char *username,
xserver_params = list_create();
xserver_params->auto_free = 1;
/* get path of Xorg from config */
xserver = g_strdup(list_get_item(g_cfg->xorg_params, 0));
list_remove_item(g_cfg->xorg_params, 0);
/* these are the must have parameters */
list_add_item(xserver_params, (tintptr) g_strdup("Xorg"));
list_add_item(xserver_params, (tintptr) g_strdup(xserver));
list_add_item(xserver_params, (tintptr) g_strdup(screen));
/* additional parameters from sesman.ini file */
@ -674,7 +679,7 @@ session_start_fork(int width, int height, int bpp, char *username,
g_setenv("XRDP_START_HEIGHT", geometry, 1);
/* fire up Xorg */
g_execvp("Xorg", pp1);
g_execvp(xserver, pp1);
}
else if (type == SESMAN_SESSION_TYPE_XVNC)
{
@ -682,8 +687,12 @@ session_start_fork(int width, int height, int bpp, char *username,
xserver_params = list_create();
xserver_params->auto_free = 1;
/* get path of Xvnc from config */
xserver = g_strdup(list_get_item(g_cfg->vnc_params, 0));
list_remove_item(g_cfg->vnc_params, 0);
/* these are the must have parameters */
list_add_item(xserver_params, (tintptr)g_strdup("Xvnc"));
list_add_item(xserver_params, (tintptr)g_strdup(xserver));
list_add_item(xserver_params, (tintptr)g_strdup(screen));
list_add_item(xserver_params, (tintptr)g_strdup("-geometry"));
list_add_item(xserver_params, (tintptr)g_strdup(geometry));
@ -701,15 +710,19 @@ session_start_fork(int width, int height, int bpp, char *username,
list_add_item(xserver_params, 0);
pp1 = (char **)xserver_params->items;
log_message(LOG_LEVEL_INFO, "%s", dumpItemsToString(xserver_params, execvpparams, 2048));
g_execvp("Xvnc", pp1);
g_execvp(xserver, pp1);
}
else if (type == SESMAN_SESSION_TYPE_XRDP)
{
xserver_params = list_create();
xserver_params->auto_free = 1;
/* get path of X11rdp from config */
xserver = g_strdup(list_get_item(g_cfg->rdp_params, 0));
list_remove_item(g_cfg->rdp_params, 0);
/* these are the must have parameters */
list_add_item(xserver_params, (tintptr)g_strdup("X11rdp"));
list_add_item(xserver_params, (tintptr)g_strdup(xserver));
list_add_item(xserver_params, (tintptr)g_strdup(screen));
list_add_item(xserver_params, (tintptr)g_strdup("-geometry"));
list_add_item(xserver_params, (tintptr)g_strdup(geometry));
@ -725,7 +738,7 @@ session_start_fork(int width, int height, int bpp, char *username,
list_add_item(xserver_params, 0);
pp1 = (char **)xserver_params->items;
log_message(LOG_LEVEL_INFO, "%s", dumpItemsToString(xserver_params, execvpparams, 2048));
g_execvp("X11rdp", pp1);
g_execvp(xserver, pp1);
}
else
{