From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 16 Dec 2017 12:32:42 +0000 (+0100)
Subject: Move mkdir_label() to mkdir-label.c
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b20c01866c4794e5a4fc1cce1b81f23aa21157ab;p=elogind.git

Move mkdir_label() to mkdir-label.c

It just seems strange to have it in a different file if mkdir-label.c exists.
---

diff --git a/src/basic/label.c b/src/basic/label.c
index 19d2bca10..0bea2aa39 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -41,22 +41,6 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         return 0;
 }
 
-int mkdir_label(const char *path, mode_t mode) {
-        int r;
-
-        assert(path);
-
-        r = mac_selinux_create_file_prepare(path, S_IFDIR);
-        if (r < 0)
-                return r;
-
-        r = mkdir_errno_wrapper(path, mode);
-        mac_selinux_create_file_clear();
-        if (r < 0)
-                return r;
-
-        return mac_smack_fix(path, false, false);
-}
 
 #if 0 /// UNNEEDED by elogind
 int symlink_label(const char *old_path, const char *new_path) {
diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 7a2287f4a..59ba85b85 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -20,11 +20,32 @@
 ***/
 
 #include <stdio.h>
+//#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "label.h"
+//#include "macro.h"
 #include "mkdir.h"
+//#include "selinux-util.h"
+//#include "smack-util.h"
+
+int mkdir_label(const char *path, mode_t mode) {
+        int r;
+
+        assert(path);
+
+        r = mac_selinux_create_file_prepare(path, S_IFDIR);
+        if (r < 0)
+                return r;
+
+        r = mkdir_errno_wrapper(path, mode);
+        mac_selinux_create_file_clear();
+        if (r < 0)
+                return r;
+
+        return mac_smack_fix(path, false, false);
+}
 
 int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink) {
         return mkdir_safe_internal(path, mode, uid, gid, follow_symlink, mkdir_label);