summaryrefslogtreecommitdiff
path: root/src/sysusers
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-13 21:10:38 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-13 21:11:07 -0400
commitf7f628b5db770feb8b18990436baefaec55c460b (patch)
tree2c660c583d95d07b1b53f985ed82a9a7583a74bf /src/sysusers
parenta334cbba7222d3d7d886c17c828fa4227c656535 (diff)
downloadsystemd-f7f628b5db770feb8b18990436baefaec55c460b.tar.gz
Add function to open temp files in selinux mode
Diffstat (limited to 'src/sysusers')
-rw-r--r--src/sysusers/sysusers.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e086c72682..d679394dfa 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -35,6 +35,8 @@
#include "conf-files.h"
#include "copy.h"
#include "utf8.h"
+#include "label.h"
+#include "fileio-label.h"
typedef enum ItemType {
ADD_USER = 'u',
@@ -312,11 +314,7 @@ static int write_files(void) {
_cleanup_fclose_ FILE *original = NULL;
group_path = fix_root("/etc/group");
- r = label_context_set("/etc/group", S_IFREG);
- if (r < 0)
- goto finish;
- r = fopen_temporary(group_path, &group, &group_tmp);
- label_context_clear();
+ r = fopen_temporary_label("/etc/group", group_path, &group, &group_tmp);
if (r < 0)
goto finish;
@@ -392,14 +390,9 @@ static int write_files(void) {
_cleanup_fclose_ FILE *original = NULL;
passwd_path = fix_root("/etc/passwd");
- r = label_context_set("/etc/passwd", S_IFREG);
+ r = fopen_temporary_label("/etc/passwd", passwd_path, &passwd, &passwd_tmp);
if (r < 0)
goto finish;
- r = fopen_temporary(passwd_path, &passwd, &passwd_tmp);
- label_context_clear();
- if (r < 0) {
- goto finish;
- }
if (fchmod(fileno(passwd), 0644) < 0) {
r = -errno;