summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-server-unix.c
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-02-16 10:00:37 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-02-16 10:00:37 +0000
commitf116b1282f8482dff6dc797f64270d95f79b53a3 (patch)
treed56ba5a2f6cb8797b54b079d5b754abac5cd14bc /dbus/dbus-server-unix.c
parentac5183eafc6bd77bec094c3ba103701a4540f08d (diff)
2003-02-16 Anders Carlsson <andersca@codefactory.se>
* bus/activation.c: (load_directory), (bus_activation_init), (bus_activation_activate_service): * bus/activation.h: * bus/driver.c: (bus_driver_handle_activate_service), (bus_driver_handle_message): More work on the activation handling. * dbus/dbus-errors.h: Add some error messages * dbus/dbus-message.c: (dbus_message_new_error_reply): * dbus/dbus-message.h: New function that creates an error message. * dbus/dbus-protocol.h: Add ACTIVATE_SERVER message. * dbus/dbus-server-unix.c: (unix_handle_watch), (_dbus_server_new_for_domain_socket): Call _dbus_fd_set_close_on_exec. * dbus/dbus-sysdeps.c: (make_pipe), (do_exec), (_dbus_spawn_async), (_dbus_disable_sigpipe), (_dbus_fd_set_close_on_exec): * dbus/dbus-sysdeps.h: Add _dbus_fd_set_close_on exec function. Also add function that checks that all open fds are set to close-on-exec and warns otherwise. * dbus/dbus-transport-unix.c: (_dbus_transport_new_for_domain_socket): Call _dbus_fd_set_close_on_exec.
Diffstat (limited to 'dbus/dbus-server-unix.c')
-rw-r--r--dbus/dbus-server-unix.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index 23bbdab3..6da70537 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -145,6 +145,7 @@ unix_handle_watch (DBusServer *server,
}
else
{
+ _dbus_fd_set_close_on_exec (client_fd);
handle_new_client_fd (server, client_fd);
}
}
@@ -247,6 +248,8 @@ _dbus_server_new_for_domain_socket (const char *path,
int listen_fd;
listen_fd = _dbus_listen_unix_socket (path, result);
+ _dbus_fd_set_close_on_exec (listen_fd);
+
if (listen_fd < 0)
return NULL;