picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #259 from poettering/logind-label-fix

Browse source 
logind: apply selinux label to XDG_RUNTIME_DIR
This commit is contained in:
Tom Gundersen 2015-06-17 19:02:19 +02:00
parent a54941f1b4 9e281beb8e
commit 99cfda2f7f
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/login/logind-user.c
View file

@ -36,9 +36,10 @@
#include "bus-error.h"
#include "conf-parser.h"
#include "clean-ipc.h"
#include "logind-user.h"
#include "smack-util.h"
#include "formats-util.h"
#include "label.h"
#include "logind-user.h"
User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) {
User *u;
@ -323,7 +324,7 @@ static int user_mkdir_runtime_path(User *u) {
if (path_is_mount_point(p, 0) <= 0) {
_cleanup_free_ char *t = NULL;
(void) mkdir(p, 0700);
(void) mkdir_label(p, 0700);
if (mac_smack_use())
r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size);
@ -351,6 +352,10 @@ static int user_mkdir_runtime_path(User *u) {
goto fail;
}
}
r = label_fix(p, false, false);
if (r < 0)
log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p);
}
u->runtime_path = p;