diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-01 12:54:55 -0700 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-01 12:54:55 -0700 |
commit | 19ec77aef7c23a529f9dd1b34e1baf1beea3eefd (patch) | |
tree | 1dcfaa1e5ec9665893f14c54d85b6bf7f515f1ad /src/launcher-util.c | |
parent | 8b62e2043a721f4b6e6e409280f5acbde73e8dfa (diff) |
launcher: Fail weston_launcher_create() if tty setup fails
Diffstat (limited to 'src/launcher-util.c')
-rw-r--r-- | src/launcher-util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/launcher-util.c b/src/launcher-util.c index bdddbb85..237f8c58 100644 --- a/src/launcher-util.c +++ b/src/launcher-util.c @@ -250,6 +250,8 @@ setup_tty(struct weston_launcher *launcher) if (fstat(STDIN_FILENO, &buf) == -1 || major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) { weston_log("stdin not a vt\n"); + weston_log("if running weston from ssh, " + "use --tty to specify a tty\n"); return -1; } @@ -319,7 +321,10 @@ weston_launcher_connect(struct weston_compositor *compositor) return NULL; } } else if (geteuid() == 0) { - setup_tty(launcher); + if (setup_tty(launcher) == -1) { + free(launcher); + return NULL; + } } else { free(launcher); return NULL; |