summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-14 04:36:24 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-14 04:36:24 +0200
commitaffda78706e2388902dd7c9ebdece52787afe3b4 (patch)
treede0f5ce333e606276c19da945c73c06e71aad420
parentea5652c296f325eceea351c19bf81a783cea4537 (diff)
main: make sure we don't accidentally acquire a controlling terminal
-rw-r--r--main.c2
-rw-r--r--manager.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index 6c730eb435..1f407dce21 100644
--- 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;
diff --git a/manager.c b/manager.c
index 88dc64bb65..4cc7d30e24 100644
--- 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 */