X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-send.c;h=65fefd25ac62c8472d2fdb2b8f5d66305119af54;hb=fc07d5d3a982e59d984d6be54342a18028faf7be;hp=bfc404e3750cd3856d9ee0df43a48f43852f8bea;hpb=c79e98eadd3056a36a662699fa650db5b1bca0c3;p=elogind.git

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index bfc404e37..65fefd25a 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -32,6 +32,7 @@
 #include "sd-journal.h"
 #include "util.h"
 #include "socket-util.h"
+#include "memfd-util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 
@@ -313,16 +314,16 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
          * here, since we want this to be a tmpfs, and one that is
          * available from early boot on and where unprivileged users
          * can create files. */
-        buffer_fd = memfd_create("journal-message", MFD_ALLOW_SEALING | MFD_CLOEXEC);
+        buffer_fd = memfd_new(NULL);
         if (buffer_fd < 0) {
-                if (errno == ENOSYS) {
+                if (buffer_fd == -ENOSYS) {
                         buffer_fd = open_tmpfile("/dev/shm", O_RDWR | O_CLOEXEC);
                         if (buffer_fd < 0)
                                 return buffer_fd;
 
                         seal = false;
                 } else
-                        return -errno;
+                        return buffer_fd;
         }
 
         n = writev(buffer_fd, w, j);
@@ -330,9 +331,9 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
                 return -errno;
 
         if (seal) {
-                r = fcntl(buffer_fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL);
+                r = memfd_set_sealed(buffer_fd);
                 if (r < 0)
-                        return -errno;
+                        return r;
         }
 
         mh.msg_iov = NULL;
@@ -383,7 +384,7 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
                                 memcpy(buffer + 8 + k - 2, ": ", 2);
                         }
 
-                        snprintf(error, sizeof(error), "ERRNO=%u", _saved_errno_);
+                        snprintf(error, sizeof(error), "ERRNO=%i", _saved_errno_);
                         char_array_0(error);
 
                         IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3");
@@ -452,13 +453,10 @@ _public_ int sd_journal_stream_fd(const char *identifier, int priority, int leve
         header[l++] = '0';
         header[l++] = '\n';
 
-        r = (int) loop_write(fd, header, l, false);
+        r = loop_write(fd, header, l, false);
         if (r < 0)
                 return r;
 
-        if ((size_t) r != l)
-                return -errno;
-
         r = fd;
         fd = -1;
         return r;