X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=294c1e799cdcbf9f00fb1acf2d2dc9be0a0c02cb;hb=7b061de2d0601a33f7246c4b909f30ddc44d7ab6;hp=928afd35e2978a83045bb678c3fb0b979d3ed0a5;hpb=11c6476a08af7a8a9ae6a2d0f8370587f7b31663;p=elogind.git diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 928afd35e..294c1e799 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -27,7 +27,6 @@ #include "util.h" #include "mkdir.h" #include "hashmap.h" -#include "strv.h" #include "fileio.h" #include "path-util.h" #include "special.h" @@ -322,7 +321,7 @@ static int user_mkdir_runtime_path(User *u) { if (path_is_mount_point(p, false) <= 0) { _cleanup_free_ char *t = NULL; - mkdir(p, 0700); + (void) mkdir(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); @@ -659,7 +658,7 @@ int user_check_linger_file(User *u) { if (!cc) return -ENOMEM; - p = strappenda("/var/lib/systemd/linger/", cc); + p = strjoina("/var/lib/systemd/linger/", cc); return access(p, F_OK) >= 0; }