HACKING: update for 0.27 release

[bup.git] / cmd / daemon-cmd.py

diff --git a/cmd/daemon-cmd.py b/cmd/daemon-cmd.py
index b83669acc1808c13482eb5caba868c731a2a1c6f..c90e3e4bb3b9224c3be2039a7760340e28c1c9e8 100755 (executable)
--- a/cmd/daemon-cmd.py
+++ b/cmd/daemon-cmd.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, getopt, socket, subprocess
+import sys, getopt, socket, subprocess, fcntl
 from bup import options, path
 from bup.helpers import *
 
@@ -35,6 +35,7 @@ for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         s.bind(sa)
         s.listen(1)
+        fcntl.fcntl(s.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
     except socket.error, e:
         s.close()
         continue
@@ -49,10 +50,17 @@ try:
         [rl,wl,xl] = select.select(socks, [], [], 60)
         for l in rl:
             s, src = l.accept()
-            log("Socket accepted connection from %s\n" % (src,))
-            sp = subprocess.Popen([path.exe(), 'mux', '--', 'server'] + extra,
-                                  stdin=os.dup(s.fileno()), stdout=os.dup(s.fileno()))
-            s.close()
+            try:
+                log("Socket accepted connection from %s\n" % (src,))
+                fd1 = os.dup(s.fileno())
+                fd2 = os.dup(s.fileno())
+                s.close()
+                sp = subprocess.Popen([path.exe(), 'mux', '--',
+                                       path.exe(), 'server']
+                                      + extra, stdin=fd1, stdout=fd2)
+            finally:
+                os.close(fd1)
+                os.close(fd2)
 finally:
     for l in socks:
         l.shutdown(socket.SHUT_RDWR)