metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust setpriv patch for 0.9.15.

Browse Source
This commit is contained in:
Bojan Smojver 2020-12-29 10:34:06 +11:00
parent 45ef53b082
commit 5d22453f7a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xrdp-0.9.2-setpriv.patch → xrdp-0.9.15-setpriv.patch
View File

@ -1,6 +1,6 @@
diff -ruN xrdp-0.9.2-vanilla/sesman/session.c xrdp-0.9.2/sesman/session.c diff -ruN xrdp-0.9.15-v/sesman/session.c xrdp-0.9.15/sesman/session.c
--- xrdp-0.9.2-vanilla/sesman/session.c 2017-03-30 17:18:55.000000000 +1100 --- xrdp-0.9.15-v/sesman/session.c 2020-12-29 01:03:43.000000000 +1100
+++ xrdp-0.9.2/sesman/session.c 2017-04-08 15:51:58.738246971 +1000 +++ xrdp-0.9.15/sesman/session.c 2020-12-29 10:31:37.895699198 +1100
@@ -33,10 +33,6 @@ @@ -33,10 +33,6 @@
#include "config_ac.h" #include "config_ac.h"
#endif #endif
@ -12,7 +12,7 @@ diff -ruN xrdp-0.9.2-vanilla/sesman/session.c xrdp-0.9.2/sesman/session.c
#include "sesman.h" #include "sesman.h"
#include "libscp_types.h" #include "libscp_types.h"
#include "xauth.h" #include "xauth.h"
@@ -641,20 +637,7 @@ @@ -668,20 +664,7 @@
if (type == SESMAN_SESSION_TYPE_XORG) if (type == SESMAN_SESSION_TYPE_XORG)
{ {
@ -25,16 +25,16 @@ diff -ruN xrdp-0.9.2-vanilla/sesman/session.c xrdp-0.9.2/sesman/session.c
- */ - */
- if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0) - if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0)
- { - {
- log_message(LOG_LEVEL_WARNING, - LOG(LOG_LEVEL_WARNING,
- "Failed to disable setuid on X server: %s", - "Failed to disable setuid on X server: %s",
- g_get_strerror()); - g_get_strerror());
- } - }
-#endif -#endif
+ char *setpriv = g_strdup("setpriv"); + char *setpriv = g_strdup("setpriv");
xserver_params = list_create(); xserver_params = list_create();
xserver_params->auto_free = 1; xserver_params->auto_free = 1;
@@ -663,6 +646,8 @@ @@ -690,6 +673,8 @@
xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0)); xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0));
/* these are the must have parameters */ /* these are the must have parameters */
@ -43,7 +43,7 @@ diff -ruN xrdp-0.9.2-vanilla/sesman/session.c xrdp-0.9.2/sesman/session.c
list_add_item(xserver_params, (tintptr) g_strdup(xserver)); 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(screen));
list_add_item(xserver_params, (tintptr) g_strdup("-auth")); list_add_item(xserver_params, (tintptr) g_strdup("-auth"));
@@ -686,7 +671,7 @@ @@ -713,7 +698,7 @@
g_setenv("XRDP_START_HEIGHT", geometry, 1); g_setenv("XRDP_START_HEIGHT", geometry, 1);
/* fire up Xorg */ /* fire up Xorg */

2
xrdp.spec
View File

@ -27,7 +27,7 @@ Source7: xrdp-polkit-1.rules
Patch0: xrdp-0.9.9-sesman.patch Patch0: xrdp-0.9.9-sesman.patch
Patch1: xrdp-0.9.14-xrdp-ini.patch Patch1: xrdp-0.9.14-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch Patch3: xrdp-0.9.15-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch Patch6: xrdp-0.9.14-log-snprintf.patch