From eb63bf5c833bb930c7998a47bd5c8363e02c122f Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sun, 24 Jan 2010 14:30:57 +0000 Subject: MFC r202500: Fix a regression that was introduced in r191882. I changed login_tty() to only work when the application is not a session leader yet. This works fine for applications in the base system, but it turns out various applications call this function after daemonizing, which means they already use their own session. If setsid() fails, just call tcsetsid() on the current session. tcsetsid() will already perform proper security checks. Reported by: Oliver Lehmann --- lib/libutil/login_tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libutil') diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c index a14e244e45aa..92dc87fe710c 100644 --- a/lib/libutil/login_tty.c +++ b/lib/libutil/login_tty.c @@ -50,7 +50,7 @@ login_tty(int fd) s = setsid(); if (s == -1) - return (-1); + s = getsid(0); if (tcsetsid(fd, s) == -1) return (-1); (void) dup2(fd, 0); -- cgit v1.3