bus-proxy: ECONNRESET/ENOTCONN can hit us on every step, hence handle it on every...

[elogind.git] / src / core / manager.c

diff --git a/src/core/manager.c b/src/core/manager.c
index d86fdd2a0125625c1e1bf3f59a4f3951806c262f..4775219e4a514649164063f1f145d3883d998354 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
@@ -1725,8 +1725,8 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                 case SIGINT:
                         if (m->running_as == SYSTEMD_SYSTEM) {
 
-                                /* If the user presses C-A-D too more
-                                 * than 7 times within 2s, we reboot
+                                /* If the user presses C-A-D more than
+                                 * 7 times within 2s, we reboot
                                  * immediately. */
 
                                 if (ratelimit_test(&m->ctrl_alt_del_ratelimit))
@@ -2106,8 +2106,7 @@ void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success) {
                 return;
         }
 
-        msg = strappenda("unit=", p);
-
+        msg = strjoina("unit=", p);
         if (audit_log_user_comm_message(audit_fd, type, msg, "systemd", NULL, NULL, NULL, success) < 0) {
                 if (errno == EPERM)
                         /* We aren't allowed to send audit messages?