From: Franck Bui <fbui@suse.com>
Date: Wed, 2 Nov 2016 15:24:57 +0000 (+0100)
Subject: core: monitor the inotify file descriptor not the console one in acquire_terminal()
X-Git-Tag: v233.3~174
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=abfb131a9c2906ad7c6c5ef27a956f5047fb6548

core: monitor the inotify file descriptor not the console one in acquire_terminal()

When waiting for the terminal to be release in acquire_terminal(), we
were monitoring the terminal fd instead of the inotify descriptor.

Therefore any write accesses would wake up the waiting process instead
of being wake up when the tty is closed only.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index d29dcd5be..98600f7a4 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -457,7 +457,7 @@ int acquire_terminal(
                                         goto fail;
                                 }
 
-                                r = fd_wait_for_event(fd, POLLIN, ts + timeout - n);
+                                r = fd_wait_for_event(notify, POLLIN, ts + timeout - n);
                                 if (r < 0)
                                         goto fail;