From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Apr 2010 19:56:38 +0000 (+0200)
Subject: socket: don't call accept() on FIFOs ever
X-Git-Tag: v1~469
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dd5ad9d4e6f98b273150042f8facd41d76830923;p=elogind.git

socket: don't call accept() on FIFOs ever
---

diff --git a/socket.c b/socket.c
index 827d7b5e9..b517344e7 100644
--- a/socket.c
+++ b/socket.c
@@ -119,9 +119,14 @@ static bool have_non_accept_socket(Socket *s) {
         if (!s->accept)
                 return true;
 
-        LIST_FOREACH(port, p, s->ports)
+        LIST_FOREACH(port, p, s->ports) {
+
+                if (p->type != SOCKET_SOCKET)
+                        return true;
+
                 if (!socket_address_can_accept(&p->address))
                         return true;
+        }
 
         return false;
 }
@@ -450,6 +455,7 @@ static int socket_watch_fds(Socket *s) {
 
                 p->fd_watch.data.socket_accept =
                         s->accept &&
+                        p->type == SOCKET_SOCKET &&
                         socket_address_can_accept(&p->address);
 
                 if ((r = unit_watch_fd(UNIT(s), p->fd, EPOLLIN, &p->fd_watch)) < 0)