mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

Make sure to exit if there is a problem setting up the desktop session.

Browse Source 
If not, the user would be dropped in as root.

PR:		159721
This commit is contained in:
Joe Marcus Clarke 2012-01-02 19:21:24 +00:00
parent f19562d64c
commit b6316e6b40
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=288432
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/gdm/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= gdm
PORTVERSION= 2.30.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2

17
x11/gdm/files/patch-daemon_gdm-session-worker.c
View File

@ -1,5 +1,5 @@
--- daemon/gdm-session-worker.c.orig 2010-08-11 12:40:07.000000000 -0500
+++ daemon/gdm-session-worker.c 2011-06-25 09:43:55.000000000 -0500
--- daemon/gdm-session-worker.c.orig 2010-08-11 13:40:07.000000000 -0400
+++ daemon/gdm-session-worker.c 2011-08-13 23:37:04.000000000 -0400
@@ -31,6 +31,9 @@
#include <errno.h>
#include <grp.h>
@ -10,16 +10,16 @@
#ifdef HAVE_LOGINDEVPERM
#include <libdevinfo.h>
@@ -341,7 +344,7 @@
@@ -341,7 +344,7 @@ gdm_session_execute (const char *file,
* what to search if PATH is unset. POSIX may, dunno.
*/
- path = "/bin:/usr/bin:.";
+ path = "/bin:/usr/bin:/usr/local/bin:.";
+ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:.";
}
len = strlen (file) + 1;
@@ -1035,17 +1038,6 @@
@@ -1035,17 +1038,6 @@ gdm_cache_copy_file (GdmSessionWorker *w
error->message);
g_error_free (error);
} else {
@ -37,7 +37,7 @@
g_debug ("Copy successful");
}
@@ -1183,7 +1175,23 @@
@@ -1183,7 +1175,23 @@ gdm_session_worker_uninitialize_pam (Gdm
return;
if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
@ -62,7 +62,7 @@
pam_close_session (worker->priv->pam_handle, 0);
gdm_session_auditor_report_logout (worker->priv->auditor);
@@ -2027,15 +2035,16 @@
@@ -2027,15 +2035,16 @@ gdm_session_worker_start_user_session (G
char *cachedirname;
char *home_dir;
int fd;
@ -83,7 +83,7 @@
if (setsid () < 0) {
g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
@@ -2043,6 +2052,25 @@
@@ -2043,6 +2052,26 @@ gdm_session_worker_start_user_session (G
_exit (2);
}
@ -93,6 +93,7 @@
+ g_debug ("%s: setusercontext () failed for %s. "
+ "Aborting.", "gdm_session_worker_start_user_session",
+ login ? login : "(null)");
+ _exit (1);
+ }
+
+ /* Propagate PATH environment variable from user context to child processes */