X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Ffileio-label.c;h=bec988ca7872c143bf794872c4612068e6c0f958;hb=6f5035f2db6ab7b4beae46c44b95e6a8b6d956b5;hp=417ca5695a956e62455d3b15873e38fdabed9003;hpb=f7f628b5db770feb8b18990436baefaec55c460b;p=elogind.git
diff --git a/src/shared/fileio-label.c b/src/shared/fileio-label.c
index 417ca5695..bec988ca7 100644
--- a/src/shared/fileio-label.c
+++ b/src/shared/fileio-label.c
@@ -19,24 +19,21 @@
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
-#include
-#include
-#include
-#include "fileio-label.h"
-#include "label.h"
#include "util.h"
+#include "selinux-util.h"
+#include "fileio-label.h"
int write_string_file_atomic_label(const char *fn, const char *line) {
int r;
- r = label_context_set(fn, S_IFREG);
+ r = mac_selinux_create_file_prepare(fn, S_IFREG);
if (r < 0)
return r;
- write_string_file_atomic(fn, line);
+ r = write_string_file_atomic(fn, line);
- label_context_clear();
+ mac_selinux_create_file_clear();
return r;
}
@@ -44,13 +41,13 @@ int write_string_file_atomic_label(const char *fn, const char *line) {
int write_env_file_label(const char *fname, char **l) {
int r;
- r = label_context_set(fname, S_IFREG);
+ r = mac_selinux_create_file_prepare(fname, S_IFREG);
if (r < 0)
return r;
- write_env_file(fname, l);
+ r = write_env_file(fname, l);
- label_context_clear();
+ mac_selinux_create_file_clear();
return r;
}
@@ -59,13 +56,13 @@ int fopen_temporary_label(const char *target,
const char *path, FILE **f, char **temp_path) {
int r;
- r = label_context_set("/etc/passwd", S_IFREG);
+ r = mac_selinux_create_file_prepare(target, S_IFREG);
if (r < 0)
return r;
r = fopen_temporary(path, f, temp_path);
- label_context_clear();
+ mac_selinux_create_file_clear();
return r;
}