aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/bacon-message-connection.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/bacon-message-connection.c b/src/bacon-message-connection.c
index c755cd5d2..c9fda4aeb 100644
--- a/src/bacon-message-connection.c
+++ b/src/bacon-message-connection.c
@@ -101,8 +101,18 @@ static gboolean server_cb (GIOChannel *source,
static gboolean
setup_connection (BaconMessageConnection *conn)
{
+ int fdflags;
+
g_return_val_if_fail (conn->chan == NULL, FALSE);
+ /* Add CLOEXEC flag on the fd to make sure the socket get closed
+ * if exec is called. */
+ fdflags = fcntl (conn->fd, F_GETFD, 0);
+ if (fdflags >= 0) {
+ fdflags |= FD_CLOEXEC;
+ fcntl (conn->fd, F_SETFD, fdflags);
+ }
+
conn->chan = g_io_channel_unix_new (conn->fd);
if (!conn->chan) {
return FALSE;
@@ -269,9 +279,7 @@ try_server (BaconMessageConnection *conn)
}
listen (conn->fd, 5);
- if (!setup_connection (conn))
- return FALSE;
- return TRUE;
+ return setup_connection (conn);
}
static gboolean