X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=31901dd8406c97c39d97dc9b3310dedb4f37a18e;hp=8bc16ed846d8f23870779682ffd7118486259e2a;hb=0229f4414b3b63934c057030deb88cbf6926bb1f;hpb=6d34c5b6d8e5bec5d1421eadc103f38d206f34f1

diff --git a/acceptor.cpp b/acceptor.cpp
index 8bc16ed..31901dd 100644
--- 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