chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: minor typo fix
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index cbc4b5cf3c733eed28ee8d0279bcc22b91fa33c2..1f3a7f375514802e09e71e61c490631823540830 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-25,11
+25,12
@@
#include <sys/epoll.h>
#include <fcntl.h>
#include <sys/epoll.h>
#include <fcntl.h>
-#include "logind-session.h"
#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 "cgroup-util.h"
+#include "logind-session.h"
#define IDLE_THRESHOLD_USEC (5*USEC_PER_MINUTE)
#define IDLE_THRESHOLD_USEC (5*USEC_PER_MINUTE)
@@
-49,10
+50,10
@@
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) {
if (hashmap_put(m->sessions, s->id, s) < 0) {
- free(s->
id
);
+ free(s->
state_file
);
free(s);
return NULL;
}
free(s);
return NULL;
}
@@
-99,7
+100,6
@@
void session_free(Session *s) {
free(s->service);
hashmap_remove(s->manager->sessions, s->id);
free(s->service);
hashmap_remove(s->manager->sessions, s->id);
-
session_remove_fifo(s);
free(s->state_file);
session_remove_fifo(s);
free(s->state_file);
@@
-287,14
+287,9
@@
int session_load(Session *s) {
}
if (leader) {
}
if (leader) {
- pid_t pid;
-
- k = parse_pid(leader, &pid);
- if (k >= 0 && pid >= 1) {
- s->leader = pid;
-
- audit_session_from_pid(pid, &s->audit_id);
- }
+ k = parse_pid(leader, &s->leader);
+ if (k >= 0)
+ audit_session_from_pid(s->leader, &s->audit_id);
}
if (type) {
}
if (type) {
@@
-326,7
+321,6
@@
int session_load(Session *s) {
close_nointr_nofail(fd);
}
close_nointr_nofail(fd);
}
-
finish:
free(remote);
free(kill_processes);
finish:
free(remote);
free(kill_processes);
@@
-334,6
+328,7
@@
finish:
free(vtnr);
free(leader);
free(audit_id);
free(vtnr);
free(leader);
free(audit_id);
+ free(class);
return r;
}
return r;
}
@@
-387,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;
}
@@
-840,7
+835,7
@@
int session_create_fifo(Session *s) {
if (s->fifo_fd < 0)
return -errno;
if (s->fifo_fd < 0)
return -errno;
- r = hashmap_put(s->manager->
fifo
_fds, INT_TO_PTR(s->fifo_fd + 1), s);
+ r = hashmap_put(s->manager->
session
_fds, INT_TO_PTR(s->fifo_fd + 1), s);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-864,7
+859,7
@@
void session_remove_fifo(Session *s) {
assert(s);
if (s->fifo_fd >= 0) {
assert(s);
if (s->fifo_fd >= 0) {
- assert_se(hashmap_remove(s->manager->
fifo
_fds, INT_TO_PTR(s->fifo_fd + 1)) == s);
+ assert_se(hashmap_remove(s->manager->
session
_fds, INT_TO_PTR(s->fifo_fd + 1)) == s);
assert_se(epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->fifo_fd, NULL) == 0);
close_nointr_nofail(s->fifo_fd);
s->fifo_fd = -1;
assert_se(epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->fifo_fd, NULL) == 0);
close_nointr_nofail(s->fifo_fd);
s->fifo_fd = -1;