From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 19 Aug 2022 23:30:37 +0000 (+0100)
Subject: prefork-interp: fixes
X-Git-Tag: archive/debian/8.0.1~94
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c949bba829f4deab895d9a682593c491fcb5ebb2;p=chiark-utils.git

prefork-interp: fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/perl/Prefork.pm b/perl/Prefork.pm
index 800fcab..2176653 100644
--- a/perl/Prefork.pm
+++ b/perl/Prefork.pm
@@ -39,6 +39,8 @@ sub server_quit ($) {
 # Returns in the executor process
 sub become_monitor () {
   close LISTEN;
+  close WATCHI;
+  close WATCHE;
 
   # Make a process group for this call
   setpgrp or fail_log("setpgrp failed: $!");
@@ -169,7 +171,8 @@ sub initialisation_complete {
   }
   open LISTEN, "+>&=$env_fds[0]" or croak "listen fd: $!";
   open CALL,   "+>&=$env_fds[1]" or croak "call fd: $!";
-  open WATCHE, ">+&=$env_fds[3]" or croak "watch stderr fd: $!";
+  open WATCHI, "+>&=$env_fds[2]" or croak "call fd: $!";
+  open WATCHE, "+>&=$env_fds[3]" or croak "watch stderr fd: $!";
 
   if (!$opts{no_openlog}) {
     openlog("prefork-interp $0", 'ndelay,nofatal,pid',