summaryrefslogtreecommitdiff
path: root/x11/lightdm/files/patch-src_session-child.c
diff options
context:
space:
mode:
authorBen Woods <woodsb02@FreeBSD.org>2017-08-05 08:17:54 +0000
committerBen Woods <woodsb02@FreeBSD.org>2017-08-05 08:17:54 +0000
commitce4ac09b170e32720016527cf870937a6d686833 (patch)
tree9b4ac8d3fa5ee54a7df645ab34cb8e250cc7721c /x11/lightdm/files/patch-src_session-child.c
parentReadd pycurl as a runtime dependency. (diff)
x11/lightdm: Update to 1.22.0
- Update PAM file to include system defaults - Set PATH to default from /etc/login.conf - Don't pass-through empty PATH from lightdm to X11 (breaks runtime)
Diffstat (limited to '')
-rw-r--r--x11/lightdm/files/patch-src_session-child.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/x11/lightdm/files/patch-src_session-child.c b/x11/lightdm/files/patch-src_session-child.c
index d0cd13b4a84c..88f5674eb558 100644
--- a/x11/lightdm/files/patch-src_session-child.c
+++ b/x11/lightdm/files/patch-src_session-child.c
@@ -1,4 +1,4 @@
---- src/session-child.c.orig 2016-10-19 12:20:14 UTC
+--- src/session-child.c.orig 2017-01-26 21:11:24 UTC
+++ src/session-child.c
@@ -13,7 +13,6 @@
#include <grp.h>
@@ -38,7 +38,7 @@
#if HAVE_LIBAUDIT
static void
audit_event (int type, const gchar *username, uid_t uid, const gchar *remote_host_name, const gchar *tty, gboolean success)
-@@ -420,7 +396,6 @@ session_child_run (int argc, char **argv
+@@ -420,7 +396,6 @@ session_child_run (int argc, char **argv)
ut.ut_tv.tv_sec = tv.tv_sec;
ut.ut_tv.tv_usec = tv.tv_usec;
@@ -46,7 +46,16 @@
#if HAVE_LIBAUDIT
audit_event (AUDIT_USER_LOGIN, username, -1, remote_host_name, tty, FALSE);
-@@ -749,7 +724,6 @@ session_child_run (int argc, char **argv
+@@ -449,7 +424,7 @@ session_child_run (int argc, char **argv)
+ else
+ {
+ /* Set POSIX variables */
+- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
++ pam_putenv (pam_handle, "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin");
+ pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
+ pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
+ pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));
+@@ -751,7 +726,6 @@ session_child_run (int argc, char **argv)
if (!pututxline (&ut))
g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
endutxent ();
@@ -54,7 +63,7 @@
#if HAVE_LIBAUDIT
audit_event (AUDIT_USER_LOGIN, username, uid, remote_host_name, tty, TRUE);
-@@ -786,7 +760,6 @@ session_child_run (int argc, char **argv
+@@ -792,7 +766,6 @@ session_child_run (int argc, char **argv)
if (!pututxline (&ut))
g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
endutxent ();