mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: Only run a login shell for new sessions

Browse Source 
This way, the environment is correctly preserved for weston. Since
commit 636156d5f6, clearenv() is only
called when we open a new PAM session, so it makes sense to only use a
login shell in that case.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Quentin Glidic
2016-05-29 13:39:26 +02:00
parent ee27744efd
commit 056889a142
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/weston-launch.c
+23 -13
View File
@@ -577,8 +577,8 @@ setup_tty(struct weston_launch *wl, const char *tty)
return 0; return 0;
} }
static void static int
setup_session(struct weston_launch *wl) setup_session(struct weston_launch *wl, char **child_argv)
{ {
char **env; char **env;
char *term; char *term;
@@ -608,6 +608,17 @@ setup_session(struct weston_launch *wl)
} }
free(env); free(env);
} }
/*
* We open a new session, so it makes sense
* to run a new login shell
*/
child_argv[0] = "/bin/sh";
child_argv[1] = "-l";
child_argv[2] = "-c";
child_argv[3] = BINDIR "/weston \"$@\"";
child_argv[4] = "weston";
return 5;
} }
static void static void
@@ -626,12 +637,19 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])
{ {
char *child_argv[MAX_ARGV_SIZE]; char *child_argv[MAX_ARGV_SIZE];
sigset_t mask; sigset_t mask;
int i; int o, i;
if (wl->verbose) if (wl->verbose)
printf("weston-launch: spawned weston with pid: %d\n", getpid()); printf("weston-launch: spawned weston with pid: %d\n", getpid());
if (wl->new_user) if (wl->new_user) {
setup_session(wl); o = setup_session(wl, child_argv);
} else {
child_argv[0] = BINDIR "/weston";
o = 1;
}
for (i = 0; i < argc; ++i)
child_argv[o + i] = argv[i];
child_argv[o + i] = NULL;
if (geteuid() == 0) if (geteuid() == 0)
drop_privileges(wl); drop_privileges(wl);
@@ -648,14 +666,6 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])
sigaddset(&mask, SIGINT); sigaddset(&mask, SIGINT);
sigprocmask(SIG_UNBLOCK, &mask, NULL); sigprocmask(SIG_UNBLOCK, &mask, NULL);
child_argv[0] = "/bin/sh";
child_argv[1] = "-l";
child_argv[2] = "-c";
child_argv[3] = BINDIR "/weston \"$@\"";
child_argv[4] = "weston";
for (i = 0; i < argc; ++i)
child_argv[5 + i] = argv[i];
child_argv[5 + i] = NULL;
execv(child_argv[0], child_argv); execv(child_argv[0], child_argv);
error(1, errno, "exec failed"); error(1, errno, "exec failed");