bus-proxy: close each connection fd only once

[elogind.git] / src / bus-proxyd / bus-proxyd.c

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 8cc4412034751e73ff6307df81f51c0a9ba86fff..478dd78744eb6d6639cbb49f2ebf2d30b44d438d 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/prctl.h>
 #include <stddef.h>
 #include <getopt.h>
@@ -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))