From dcbf42230f1ed27451d428ac3e6e97c85202d7c7 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 28 Mar 2026 12:07:36 +0000 Subject: s6-setsid bugfix: only check ctty when actually calling tcsetpgrp --- AUTHORS | 1 + CONTRIBUTING | 2 +- src/daemontools-extras/s6-setsid.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2bbbc71..a371083 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,3 +45,4 @@ Thanks to: Earl Chew Saj Goonatilleke Hoël Bézier + Josiah Frentsos diff --git a/CONTRIBUTING b/CONTRIBUTING index 3173998..bc10b3c 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -10,7 +10,7 @@ * I, the contributor, am the copyright owner of these changes * I submit these changes according to the project's license -with no additionam requirements +with no additional requirements * I understand these changes in full and will be able to respond to review comments. diff --git a/src/daemontools-extras/s6-setsid.c b/src/daemontools-extras/s6-setsid.c index 21662d0..144bbb6 100644 --- a/src/daemontools-extras/s6-setsid.c +++ b/src/daemontools-extras/s6-setsid.c @@ -60,7 +60,7 @@ int main (int argc, char const *const *argv) { if (!uint0_scan(wgola[GOLA_CTTY], &ctty)) dieusage() ; } - else if (wgolb & (GOLB_PGRP | GOLB_FG)) + else if (wgolb & GOLB_PGRP & GOLB_FG) { int fd = openc_read("/dev/tty") ; if (fd == -1) strerr_diefu2sys(111, "open ", "/dev/tty") ; -- cgit v1.3.1