From: ian <ian>
Date: Sat, 1 Nov 2003 00:44:54 +0000 (+0000)
Subject: @@ -1,3 +1,9 @@
X-Git-Tag: debian_version_1_0_1_99_3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=commitdiff_plain;h=f653ddb3040aee9946963d0ca44c211a047541dd;ds=sidebyside

@@ -1,3 +1,9 @@
+userv (1.0.1.99.3) unstable; urgency=low
+
+  * Actually apply _all_ of PJB's fd patch!
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat,  1 Nov 2003 00:44:44 +0000
+
 userv (1.0.1.99.2) unstable; urgency=low

   * Actually ship uservd(8) !
---

diff --git a/client.c b/client.c
index 0af49e8..60869b0 100644
--- a/client.c
+++ b/client.c
@@ -1164,7 +1164,7 @@ static void prepare_asynchsignals(void) {
 }
 
 
-static void cat_close_unwanted_pipes(void) {
+static void close_unwanted_pipes(void) {
   int fd;
 
   for (fd=0; fd<fdsetupsize; fd++) {
@@ -1220,15 +1220,13 @@ static void connect_pipes(void) {
       reading= fdsetup[fd].mods & fdm_read;
       catdup(catnamebuf, fdsetup[fd].copyfd, reading ? 0 : 1);
       catdup(catnamebuf, fdsetup[fd].pipefd, reading ? 1 : 0);
-      cat_close_unwanted_pipes();
+      close_unwanted_pipes();
       execl("/bin/cat",catnamebuf,(char*)0);
       fprintf(stderr,"userv: %s: cannot exec `cat': %s\n",catnamebuf,strerror(errno));
       exit(-1);
     }
-    if (fdsetup[fd].copyfd>2)
-      if (close(fdsetup[fd].copyfd)) fsyscallerror("close real fd for %d",fd);
-    if (close(fdsetup[fd].pipefd)) fsyscallerror("close pipe fd for %d",fd);
   }
+  close_unwanted_pipes();
 }
 
 static void server_sendconfirm(void) {
diff --git a/debian/changelog b/debian/changelog
index fe26c26..652a741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userv (1.0.1.99.3) unstable; urgency=low
+
+  * Actually apply _all_ of PJB's fd patch!
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat,  1 Nov 2003 00:44:44 +0000
+
 userv (1.0.1.99.2) unstable; urgency=low
 
   * Actually ship uservd(8) !