load: make sure that unit files in /etc/ always take precedence, even over link targe...

[elogind.git] / src / socket.c

diff --git a/src/socket.c b/src/socket.c
index 4cf21cf0b181eec475fc9e564c8eacc80496439c..b06ba093fbe07206ba0a416be1a424f6f1a48d4c 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -686,7 +686,7 @@ static int fifo_address_create(
         }
 
         if (!S_ISFIFO(st.st_mode) ||
-            st.st_mode != (socket_mode & ~old_mask) ||
+            (st.st_mode & 0777) != (socket_mode & ~old_mask) ||
             st.st_uid != getuid() ||
             st.st_gid != getgid()) {
 
@@ -1698,6 +1698,17 @@ void socket_connection_unref(Socket *s) {
         log_debug("%s: One connection closed, %u left.", s->meta.id, s->n_connections);
 }
 
+static void socket_reset_maintenance(Unit *u) {
+        Socket *s = SOCKET(u);
+
+        assert(s);
+
+        if (s->state == SOCKET_MAINTENANCE)
+                socket_set_state(s, SOCKET_DEAD);
+
+        s->failure = false;
+}
+
 static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
         [SOCKET_DEAD] = "dead",
         [SOCKET_START_PRE] = "start-pre",
@@ -1750,5 +1761,7 @@ const UnitVTable socket_vtable = {
         .sigchld_event = socket_sigchld_event,
         .timer_event = socket_timer_event,
 
+        .reset_maintenance = socket_reset_maintenance,
+
         .bus_message_handler = bus_socket_message_handler
 };