chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkdir: append _label to all mkdir() calls that explicitly set the selinux context
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index e297d3feeba689880c2b01e51ffd8c0e31df79b2..5c8d549316045eb15d5d8a92a299bf20f326ca51 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-28,6
+28,7
@@
#include "strv.h"
#include "util.h"
#include "mkdir.h"
#include "strv.h"
#include "util.h"
#include "mkdir.h"
+#include "path-util.h"
#include "cgroup-util.h"
#include "logind-session.h"
#include "cgroup-util.h"
#include "logind-session.h"
@@
-49,7
+50,7
@@
Session* session_new(Manager *m, User *u, const char *id) {
return NULL;
}
return NULL;
}
- s->id =
file_name_from_path
(s->state_file);
+ s->id =
path_get_file_name
(s->state_file);
if (hashmap_put(m->sessions, s->id, s) < 0) {
free(s->state_file);
if (hashmap_put(m->sessions, s->id, s) < 0) {
free(s->state_file);
@@
-115,7
+116,7
@@
int session_save(Session *s) {
if (!s->started)
return 0;
if (!s->started)
return 0;
- r =
safe_mkdir
("/run/systemd/sessions", 0755, 0, 0);
+ r =
mkdir_safe_label
("/run/systemd/sessions", 0755, 0, 0);
if (r < 0)
goto finish;
if (r < 0)
goto finish;
@@
-381,7
+382,7
@@
static int session_link_x11_socket(Session *s) {
c[k] = 0;
if (access(f, F_OK) < 0) {
c[k] = 0;
if (access(f, F_OK) < 0) {
- log_warning("Session %s has display %s with nonexisting socket %s.", s->id, s->display, f);
+ log_warning("Session %s has display %s with non
-
existing socket %s.", s->id, s->display, f);
free(f);
return -ENOENT;
}
free(f);
return -ENOENT;
}
@@
-815,7
+816,7
@@
int session_create_fifo(Session *s) {
/* Create FIFO */
if (!s->fifo_path) {
/* Create FIFO */
if (!s->fifo_path) {
- r =
safe_mkdir
("/run/systemd/sessions", 0755, 0, 0);
+ r =
mkdir_safe_label
("/run/systemd/sessions", 0755, 0, 0);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-840,7
+841,7
@@
int session_create_fifo(Session *s) {
zero(ev);
ev.events = 0;
zero(ev);
ev.events = 0;
- ev.data.u32 = FD_
FIFO
_BASE + s->fifo_fd;
+ ev.data.u32 = FD_
OTHER
_BASE + s->fifo_fd;
if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->fifo_fd, &ev) < 0)
return -errno;
if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->fifo_fd, &ev) < 0)
return -errno;