chiark / gitweb /
bus-proxy: close each connection fd only once
authorLennart Poettering <lennart@poettering.net>
Fri, 13 Feb 2015 16:15:41 +0000 (17:15 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 13 Feb 2015 16:18:36 +0000 (17:18 +0100)
After passing the fds over to the sd_bus object, we should forget them,
so that we don't close them a second time when the object goes away.

src/bus-proxyd/bus-proxyd.c

index e07761a..478dd78 100644 (file)
@@ -69,7 +69,7 @@ static ClientContext *client_context_free(ClientContext *c) {
         if (!c)
                 return NULL;
 
-        close(c->fd);
+        safe_close(c->fd);
         free(c);
 
         return NULL;
@@ -101,6 +101,8 @@ static void *run_client(void *userdata) {
         if (r < 0)
                 goto exit;
 
+        c->fd = -1;
+
         /* set comm to "p$PIDu$UID" and suffix with '*' if truncated */
         r = snprintf(comm, sizeof(comm), "p" PID_FMT "u" UID_FMT, p->local_creds.pid, p->local_creds.uid);
         if (r >= (ssize_t)sizeof(comm))