summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-server-socket.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-05-06 03:41:50 +0200
committerLennart Poettering <lennart@poettering.net>2009-05-20 02:09:31 +0200
commit89318bbeb4076d8d9de9831d69621fc1411760d3 (patch)
tree3689cfb43a9aa8e681129120032098d219d9d3e8 /dbus/dbus-server-socket.c
parent3c319c71938ab06cf6f1750750927ffb5c200de4 (diff)
cloexec: set all sockets that are created with SOCK_CLOEXEC
Since all socket users enable FD_CLOEXEC anyway we can just do that in _dbus_open_socket() and be done with it for all cases. By side effect this allows us to use SOCK_CLOEXEC and hence close the CLOEXEC race.
Diffstat (limited to 'dbus/dbus-server-socket.c')
-rw-r--r--dbus/dbus-server-socket.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index 0cd2bb6c..b663e49d 100644
--- a/dbus/dbus-server-socket.c
+++ b/dbus/dbus-server-socket.c
@@ -195,8 +195,6 @@ socket_handle_watch (DBusWatch *watch,
}
else
{
- _dbus_fd_set_close_on_exec (client_fd);
-
if (!handle_new_client_fd_and_unlock (server, client_fd))
_dbus_verbose ("Rejected client connection due to lack of memory\n");
}
@@ -413,9 +411,6 @@ _dbus_server_new_for_tcp_socket (const char *host,
goto failed_1;
}
- for (i = 0 ; i < nlisten_fds ; i++)
- _dbus_fd_set_close_on_exec (listen_fds[i]);
-
_dbus_string_init_const (&host_str, host);
if (!_dbus_string_append (&address, "tcp:host=") ||
!_dbus_address_append_escaped (&address, &host_str) ||