diff options
| author | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-16 18:56:33 -0500 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-16 19:22:20 -0500 |
| commit | ee65dc6e52e0d484e6384d7e96253ddf3a12b4bc (patch) | |
| tree | 60b416a5450273c36f1b9ce9b097801ea12f7b32 | |
| parent | b89c42ec968545df6e7ba0e3367d4da08ed0b766 (diff) | |
| download | xrdp-proprietary-ee65dc6e52e0d484e6384d7e96253ddf3a12b4bc.tar.gz xrdp-proprietary-ee65dc6e52e0d484e6384d7e96253ddf3a12b4bc.zip | |
Disable SHM access between XUP and Xorg as they are not running on the same machine
| -rw-r--r-- | sesman/session.c | 2 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpup.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sesman/session.c b/sesman/session.c index 24958d87..b9c63188 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -876,6 +876,8 @@ session_start_fork(int width, int height, int bpp, char *username, list_add_item(xserver_params, (long)g_strdup("-depth")); list_add_item(xserver_params, (long)g_strdup(depth)); list_add_item(xserver_params, (long)g_strdup("-reset")); + list_add_item(xserver_params, (long)g_strdup("-extension")); + list_add_item(xserver_params, (long)g_strdup("MIT-SHM")); // list_add_item(xserver_params, (long)g_strdup("-terminate")); /* additional parameters from sesman.ini file */ diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index 83525251..d9f691b5 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define LLOGLN(_level, _args) \ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0) -static int g_use_shmem = 1; /* turns on or off */ +static int g_use_shmem = 0; /* turns on or off */ static int g_shmemid = 0; static char *g_shmemptr = 0; static int g_shmem_lineBytes = 0; |