chiark / gitweb /
log: never close file descriptors < 3
authorLennart Poettering <lennart@poettering.net>
Tue, 18 May 2010 03:10:52 +0000 (05:10 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 18 May 2010 03:10:52 +0000 (05:10 +0200)
src/log.c
src/main.c

index 5d17955..7b4db4c 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -50,8 +50,10 @@ void log_close_console(void) {
         if (console_fd < 0)
                 return;
 
-        if (getpid() == 1 || console_fd != STDERR_FILENO) {
-                close_nointr_nofail(console_fd);
+        if (getpid() == 1) {
+                if (console_fd >= 3)
+                        close_nointr_nofail(console_fd);
+
                 console_fd = -1;
         }
 }
index 311ece6..2e754fe 100644 (file)
@@ -175,7 +175,7 @@ static void install_crash_handler(void) {
 static int make_null_stdio(void) {
         int null_fd, r;
 
-        if ((null_fd = open("/dev/null", O_RDWR)) < 0) {
+        if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0) {
                 log_error("Failed to open /dev/null: %m");
                 return -errno;
         }