X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fnamespace.c;h=38325030133cf8e4b5f63f0c4bc2ea4987757c52;hb=dc75168823540076b354135f6e2de7a9a978fbca;hp=4c411096a1e50cb7b28035dc2bc832a7664a57e1;hpb=4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f;p=elogind.git

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 4c411096a..383250301 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -25,24 +25,17 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sched.h>
-#include <sys/syscall.h>
-#include <limits.h>
 #include <linux/fs.h>
-#include <sys/file.h>
 
 #include "strv.h"
 #include "util.h"
 #include "path-util.h"
-#include "namespace.h"
 #include "missing.h"
-#include "execute.h"
 #include "loopback-setup.h"
-#include "mkdir.h"
 #include "dev-setup.h"
-#include "def.h"
-#include "label.h"
+#include "selinux-util.h"
+#include "namespace.h"
 
 typedef enum MountMode {
         /* This is ordered by priority! */
@@ -156,40 +149,40 @@ static int mount_dev(BindMount *m) {
         if (!mkdtemp(temporary_mount))
                 return -errno;
 
-        dev = strappenda(temporary_mount, "/dev");
-        (void)mkdir(dev, 0755);
+        dev = strjoina(temporary_mount, "/dev");
+        (void) mkdir(dev, 0755);
         if (mount("tmpfs", dev, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=755") < 0) {
                 r = -errno;
                 goto fail;
         }
 
-        devpts = strappenda(temporary_mount, "/dev/pts");
-        (void)mkdir(devpts, 0755);
+        devpts = strjoina(temporary_mount, "/dev/pts");
+        (void) mkdir(devpts, 0755);
         if (mount("/dev/pts", devpts, NULL, MS_BIND, NULL) < 0) {
                 r = -errno;
                 goto fail;
         }
 
-        devptmx = strappenda(temporary_mount, "/dev/ptmx");
+        devptmx = strjoina(temporary_mount, "/dev/ptmx");
         symlink("pts/ptmx", devptmx);
 
-        devshm = strappenda(temporary_mount, "/dev/shm");
-        (void)mkdir(devshm, 01777);
+        devshm = strjoina(temporary_mount, "/dev/shm");
+        (void) mkdir(devshm, 01777);
         r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL);
         if (r < 0) {
                 r = -errno;
                 goto fail;
         }
 
-        devmqueue = strappenda(temporary_mount, "/dev/mqueue");
-        (void)mkdir(devmqueue, 0755);
+        devmqueue = strjoina(temporary_mount, "/dev/mqueue");
+        (void) mkdir(devmqueue, 0755);
         mount("/dev/mqueue", devmqueue, NULL, MS_BIND, NULL);
 
-        devhugepages = strappenda(temporary_mount, "/dev/hugepages");
-        (void)mkdir(devhugepages, 0755);
+        devhugepages = strjoina(temporary_mount, "/dev/hugepages");
+        (void) mkdir(devhugepages, 0755);
         mount("/dev/hugepages", devhugepages, NULL, MS_BIND, NULL);
 
-        devlog = strappenda(temporary_mount, "/dev/log");
+        devlog = strjoina(temporary_mount, "/dev/log");
         symlink("/run/systemd/journal/dev-log", devlog);
 
         NULSTR_FOREACH(d, devnodes) {
@@ -279,8 +272,8 @@ static int mount_kdbus(BindMount *m) {
         if (!mkdtemp(temporary_mount))
                 return log_error_errno(errno, "Failed create temp dir: %m");
 
-        root = strappenda(temporary_mount, "/kdbus");
-        (void)mkdir(root, 0755);
+        root = strjoina(temporary_mount, "/kdbus");
+        (void) mkdir(root, 0755);
         if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_STRICTATIME, "mode=777") < 0) {
                 r = -errno;
                 goto fail;
@@ -294,7 +287,7 @@ static int mount_kdbus(BindMount *m) {
                 goto fail;
         }
 
-        busnode = strappenda(root, "/bus");
+        busnode = strjoina(root, "/bus");
         if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
                 log_error_errno(errno, "mknod() for %s failed: %m", busnode);
                 r = -errno;
@@ -421,7 +414,7 @@ int setup_namespace(
                 bool private_dev,
                 ProtectHome protect_home,
                 ProtectSystem protect_system,
-                unsigned mount_flags) {
+                unsigned long mount_flags) {
 
         BindMount *m, *mounts = NULL;
         unsigned n;
@@ -565,7 +558,7 @@ static int setup_one_tmp_dir(const char *id, const char *prefix, char **path) {
         RUN_WITH_UMASK(0000) {
                 char *y;
 
-                y = strappenda(x, "/tmp");
+                y = strjoina(x, "/tmp");
 
                 if (mkdir(y, 0777 | S_ISVTX) < 0)
                         return -errno;
@@ -593,7 +586,7 @@ int setup_tmp_dirs(const char *id, char **tmp_dir, char **var_tmp_dir) {
         if (r < 0) {
                 char *t;
 
-                t = strappenda(a, "/tmp");
+                t = strjoina(a, "/tmp");
                 rmdir(t);
                 rmdir(a);