diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-07 12:57:31 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:49:38 +0200 |
| commit | 1ff27c767d318309b986786d153fab5576b42334 (patch) | |
| tree | 4ab2745c66cbc8a3c770a427b1081cced316b746 /src | |
| parent | 598c6f2e5d8e834b1dd8fc26f1c31faf427030b1 (diff) | |
logind: simplify one conditional
Don't bother with removing the directory if we didn't create it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/logind-user.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 2d80d7325..b82941c5b 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -353,16 +353,13 @@ static int user_mkdir_runtime_path(User *u) { if (path_is_mount_point(u->runtime_path, NULL, 0) <= 0) { _cleanup_free_ char *t = NULL; - (void) mkdir_label(u->runtime_path, 0700); + r = asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu%s", + u->uid, u->gid, u->manager->runtime_dir_size, + mac_smack_use() ? ",smackfsroot=*" : ""); + if (r < 0) + return log_oom(); - 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); - else - r = asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); - if (r < 0) { - r = log_oom(); - goto fail; - } + (void) mkdir_label(u->runtime_path, 0700); r = mount("tmpfs", u->runtime_path, "tmpfs", MS_NODEV|MS_NOSUID, t); if (r < 0) { |