chiark / gitweb /
main: make sure we don't accidentally acquire a controlling terminal
authorLennart Poettering <lennart@poettering.net>
Fri, 14 May 2010 02:36:24 +0000 (04:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 14 May 2010 02:36:24 +0000 (04:36 +0200)
main.c
manager.c

diff --git a/main.c b/main.c
index 6c730eb..1f407dc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -191,7 +191,7 @@ static int console_setup(bool do_reset) {
 
         release_terminal();
 
-        if ((tty_fd = open_terminal("/dev/console", O_WRONLY)) < 0) {
+        if ((tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY)) < 0) {
                 log_error("Failed to open /dev/console: %s", strerror(-tty_fd));
                 r = -tty_fd;
                 goto finish;
index 88dc64b..4cc7d30 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -68,7 +68,7 @@ static int enable_special_signals(Manager *m) {
         if (reboot(RB_DISABLE_CAD) < 0)
                 log_warning("Failed to enable ctrl-alt-del handling: %m");
 
-        if ((fd = open_terminal("/dev/tty0", O_RDWR)) < 0)
+        if ((fd = open_terminal("/dev/tty0", O_RDWR|O_NOCTTY)) < 0)
                 log_warning("Failed to open /dev/tty0: %m");
         else {
                 /* Enable that we get SIGWINCH on kbrequest */