systemadm: make fragment path a clickable link

[elogind.git] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index f81d2c5c8a627c7d3d9d10ade247869c6524cb92..c486a8acd1d854a83e0915b44f6de15f1f91d23a 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -75,7 +75,7 @@ struct Stream {
 
         int fd;
 
-        LogTarget target;
+        StreamTarget target;
         int priority;
         char *process;
         pid_t pid;
@@ -424,11 +424,25 @@ static int server_init(Server *s, unsigned n_sockets) {
 
         for (i = 0; i < n_sockets; i++) {
                 struct epoll_event ev;
+                int fd;
+
+                fd = SD_LISTEN_FDS_START+i;
+
+                if ((r = sd_is_socket(fd, SOCK_STREAM, 1)) < 0) {
+                        log_error("Failed to determine file descriptor type: %s", strerror(-r));
+                        goto fail;
+                }
+
+                if (!r) {
+                        log_error("Wrong file descriptor type.");
+                        r = -EINVAL;
+                        goto fail;
+                }
 
                 zero(ev);
                 ev.events = EPOLLIN;
-                ev.data.ptr = UINT_TO_PTR(SD_LISTEN_FDS_START+i);
-                if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SD_LISTEN_FDS_START+i, &ev) < 0) {
+                ev.data.ptr = UINT_TO_PTR(fd);
+                if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
                         r = -errno;
                         log_error("Failed to add server fd to epoll object: %s", strerror(errno));
                         goto fail;