X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fmemfd.c;h=b55817795162637a80061cca63628f30c003f463;hp=162c12f7a77e035e472ca4d2bc470c7852e8551c;hb=47f0f4eb1d79ec37dfbe6a382817c0384b106373;hpb=27c64db6dff88ebe9761dfe3b0c073d2a9bf2e41

diff --git a/src/shared/memfd.c b/src/shared/memfd.c
index 162c12f7a..b55817795 100644
--- a/src/shared/memfd.c
+++ b/src/shared/memfd.c
@@ -65,7 +65,7 @@ int memfd_new(const char *name) {
                 }
         }
 
-        fd = memfd_create(name, MFD_ALLOW_SEALING);
+        fd = memfd_create(name, MFD_ALLOW_SEALING | MFD_CLOEXEC);
         if (fd < 0)
                 return -errno;
 
@@ -172,50 +172,3 @@ int memfd_new_and_map(const char *name, size_t sz, void **p) {
 
         return r;
 }
-
-int memfd_get_name(int fd, char **name) {
-        char path[sizeof("/proc/self/fd/") + DECIMAL_STR_MAX(int)], buf[FILENAME_MAX+1], *e;
-        const char *delim, *end;
-        _cleanup_free_ char *n = NULL;
-        ssize_t k;
-
-        assert(fd >= 0);
-        assert(name);
-
-        sprintf(path, "/proc/self/fd/%i", fd);
-
-        k = readlink(path, buf, sizeof(buf));
-        if (k < 0)
-                return -errno;
-
-        if ((size_t) k >= sizeof(buf))
-                return -E2BIG;
-
-        buf[k] = 0;
-
-        delim = strstr(buf, ":[");
-        if (!delim)
-                return -EIO;
-
-        delim = strchr(delim + 2, ':');
-        if (!delim)
-                return -EIO;
-
-        delim++;
-
-        end = strchr(delim, ']');
-        if (!end)
-                return -EIO;
-
-        n = strndup(delim, end - delim);
-        if (!n)
-                return -ENOMEM;
-
-        e = utf8_escape_invalid(n);
-        if (!e)
-                return -ENOMEM;
-
-        *name = e;
-
-        return 0;
-}