From 80f1ebe9aaa1f5fb0ee796f005b0abda1628226d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 6 Jan 2015 19:41:49 +0000
Subject:  Prevent failure of -1 option in ucspi servers when stdout is closed

---
 src/conn-tools/s6-ipcserver.c  | 10 ++++++++--
 src/conn-tools/s6-tcpserver4.c | 10 ++++++++--
 src/conn-tools/s6-tcpserver6.c | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'src/conn-tools')

diff --git a/src/conn-tools/s6-ipcserver.c b/src/conn-tools/s6-ipcserver.c
index 234127e..1210139 100644
--- a/src/conn-tools/s6-ipcserver.c
+++ b/src/conn-tools/s6-ipcserver.c
@@ -6,6 +6,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <grp.h>
 #include <limits.h>
 #include <signal.h>
@@ -350,8 +351,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
     argc -= l.ind ; argv += l.ind ;
     if (argc < 2) dieusage() ;
     if (!*argv[0]) dieusage() ;
-    fd_close(0) ;
-    if (!flag1) fd_close(1) ;
+    close(0) ;
+    if (flag1)
+    {
+      if (fcntl(1, F_GETFD) < 0)
+        strerr_dief1sys(100, "called with option -1 but stdout said") ;
+    }
+    else close(1) ;
     if (!maxconn) maxconn = 1 ;
     if (maxconn > ABSOLUTE_MAXCONN) maxconn = ABSOLUTE_MAXCONN ;
     if (!flaglookup || (localmaxconn > maxconn)) localmaxconn = maxconn ;
diff --git a/src/conn-tools/s6-tcpserver4.c b/src/conn-tools/s6-tcpserver4.c
index 77ecebd..e030b6d 100644
--- a/src/conn-tools/s6-tcpserver4.c
+++ b/src/conn-tools/s6-tcpserver4.c
@@ -6,6 +6,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <grp.h>
 #include <signal.h>
@@ -327,8 +328,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
     argc -= l.ind ; argv += l.ind ;
     if (argc < 3) dieusage() ;
     if (!ip4_scan(argv[0], ip) || !uint160_scan(argv[1], &port)) dieusage() ;
-    fd_close(0) ;
-    if (!flag1) fd_close(1) ;
+    close(0) ;
+    if (flag1)
+    {
+      if (fcntl(1, F_GETFD) < 0)
+        strerr_dief1sys(100, "called with option -1 but stdout said") ;
+    }
+    else close(1) ;
     if (!maxconn) maxconn = 1 ;
     if (maxconn > ABSOLUTE_MAXCONN) maxconn = ABSOLUTE_MAXCONN ;
     if (localmaxconn > maxconn) localmaxconn = maxconn ;
diff --git a/src/conn-tools/s6-tcpserver6.c b/src/conn-tools/s6-tcpserver6.c
index ef988d0..999a564 100644
--- a/src/conn-tools/s6-tcpserver6.c
+++ b/src/conn-tools/s6-tcpserver6.c
@@ -6,6 +6,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <grp.h>
 #include <signal.h>
@@ -327,8 +328,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
     argc -= l.ind ; argv += l.ind ;
     if (argc < 3) dieusage() ;
     if (!ip6_scan(argv[0], ip) || !uint160_scan(argv[1], &port)) dieusage() ;
-    fd_close(0) ;
-    if (!flag1) fd_close(1) ;
+    close(0) ;
+    if (flag1)
+    {
+      if (fcntl(1, F_GETFD) < 0)
+        strerr_dief1sys(100, "called with option -1 but stdout said") ;
+    }
+    else close(1) ;
     if (!maxconn) maxconn = 1 ;
     if (maxconn > ABSOLUTE_MAXCONN) maxconn = ABSOLUTE_MAXCONN ;
     if (localmaxconn > maxconn) localmaxconn = maxconn ;
-- 
cgit v1.2.3