Stop leaking the /dev/null fd after spawning a subprocess.

[cubemap] / acceptor.cpp

diff --git a/acceptor.cpp b/acceptor.cpp
index 8bc16ed846d8f23870779682ffd7118486259e2a..31901dd8406c97c39d97dc9b3310dedb4f37a18e 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -48,7 +48,7 @@ int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type)
                exit(1);
        }
 
-       if (bind(server_sock, reinterpret_cast<const sockaddr *>(&addr), sizeof(addr)) == -1) {
+       if (::bind(server_sock, reinterpret_cast<const sockaddr *>(&addr), sizeof(addr)) == -1) {
                log_perror("bind");
                exit(1);
        }
@@ -104,7 +104,7 @@ Acceptor::Acceptor(const AcceptorProto &serialized)
 {
        // Set back the close-on-exec flag for the socket.
        // (This can't leak into a child, since we haven't been started yet.)
-       fcntl(server_sock, F_SETFD, 1);
+       fcntl(server_sock, F_SETFD, O_CLOEXEC);
 }
 
 AcceptorProto Acceptor::serialize() const