X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Fsd-login.c;h=66c4487ff88ff6a3f37f6fe117816cb540530579;hp=c100a7b4f2bee14080cce7383415ed8a956ac854;hb=44a6b1b68029833893f6e9cee35aa27a974038f6;hpb=51f58f083a9454599080dc01d7740cf097f48920
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index c100a7b4f..66c4487ff 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -6,16 +6,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -23,202 +23,64 @@
#include
#include
#include
+#include
#include "util.h"
#include "cgroup-util.h"
#include "macro.h"
#include "sd-login.h"
#include "strv.h"
-
-static int pid_get_cgroup(pid_t pid, char **root, char **cgroup) {
- char *cg_process, *cg_init, *p;
- int r;
-
- if (pid == 0)
- pid = getpid();
-
- if (pid <= 0)
- return -EINVAL;
-
- r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &cg_process);
- if (r < 0)
- return r;
-
- r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &cg_init);
- if (r < 0) {
- free(cg_process);
- return r;
- }
-
- if (endswith(cg_init, "/system"))
- cg_init[strlen(cg_init)-7] = 0;
- else if (streq(cg_init, "/"))
- cg_init[0] = 0;
-
- if (startswith(cg_process, cg_init))
- p = cg_process + strlen(cg_init);
- else
- p = cg_process;
-
- free(cg_init);
-
- if (cgroup) {
- char* c;
-
- c = strdup(p);
- if (!c) {
- free(cg_process);
- return -ENOMEM;
- }
-
- *cgroup = c;
- }
-
- if (root) {
- cg_process[p-cg_process] = 0;
- *root = cg_process;
- } else
- free(cg_process);
-
- return 0;
-}
+#include "fileio.h"
_public_ int sd_pid_get_session(pid_t pid, char **session) {
- int r;
- char *cgroup, *p;
+ if (pid < 0)
+ return -EINVAL;
if (!session)
return -EINVAL;
- r = pid_get_cgroup(pid, NULL, &cgroup);
- if (r < 0)
- return r;
-
- if (!startswith(cgroup, "/user/")) {
- free(cgroup);
- return -ENOENT;
- }
-
- p = strchr(cgroup + 6, '/');
- if (!p) {
- free(cgroup);
- return -ENOENT;
- }
-
- p++;
- if (startswith(p, "shared/") || streq(p, "shared")) {
- free(cgroup);
- return -ENOENT;
- }
-
- p = strndup(p, strcspn(p, "/"));
- free(cgroup);
-
- if (!p)
- return -ENOMEM;
-
- *session = p;
- return 0;
+ return cg_pid_get_session(pid, session);
}
_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
- int r;
- char *cgroup, *p, *at, *b;
- size_t k;
+ if (pid < 0)
+ return -EINVAL;
if (!unit)
return -EINVAL;
- r = pid_get_cgroup(pid, NULL, &cgroup);
- if (r < 0)
- return r;
-
- if (!startswith(cgroup, "/system/")) {
- free(cgroup);
- return -ENOENT;
- }
-
- p = cgroup + 8;
- k = strcspn(p, "/");
-
- at = memchr(p, '@', k);
- if (at && at[1] == '.') {
- size_t j;
-
- /* This is a templated service */
- if (p[k] != '/') {
- free(cgroup);
- return -EIO;
- }
+ return cg_pid_get_unit(pid, unit);
+}
- j = strcspn(p+k+1, "/");
+_public_ int sd_pid_get_user_unit(pid_t pid, char **unit) {
- b = malloc(k + j + 1);
+ if (pid < 0)
+ return -EINVAL;
+ if (!unit)
+ return -EINVAL;
- if (b) {
- memcpy(b, p, at - p + 1);
- memcpy(b + (at - p) + 1, p + k + 1, j);
- memcpy(b + (at - p) + 1 + j, at + 1, k - (at - p) - 1);
- b[k+j] = 0;
- }
- } else
- b = strndup(p, k);
+ return cg_pid_get_user_unit(pid, unit);
+}
- free(cgroup);
+_public_ int sd_pid_get_machine_name(pid_t pid, char **name) {
- if (!b)
- return -ENOMEM;
+ if (pid < 0)
+ return -EINVAL;
+ if (!name)
+ return -EINVAL;
- *unit = b;
- return 0;
+ return cg_pid_get_machine_name(pid, name);
}
_public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
- int r;
- char *root, *cgroup, *p, *cc;
- struct stat st;
- if (!uid)
+ if (pid < 0)
return -EINVAL;
- r = pid_get_cgroup(pid, &root, &cgroup);
- if (r < 0)
- return r;
-
- if (!startswith(cgroup, "/user/")) {
- free(cgroup);
- free(root);
- return -ENOENT;
- }
-
- p = strchr(cgroup + 6, '/');
- if (!p) {
- free(cgroup);
- return -ENOENT;
- }
-
- p++;
- p += strcspn(p, "/");
- *p = 0;
-
- r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, cgroup, &cc);
- free(root);
- free(cgroup);
-
- if (r < 0)
- return -ENOMEM;
-
- r = lstat(cc, &st);
- free(cc);
-
- if (r < 0)
- return -errno;
-
- if (!S_ISDIR(st.st_mode))
- return -ENOTDIR;
+ if (!uid)
+ return -EINVAL;
- *uid = st.st_uid;
- return 0;
+ return cg_pid_get_owner_uid(pid, uid);
}
_public_ int sd_uid_get_state(uid_t uid, char**state) {
@@ -253,7 +115,8 @@ _public_ int sd_uid_get_state(uid_t uid, char**state) {
}
_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) {
- char *p, *w, *t, *state, *s = NULL;
+ char *w, *state;
+ _cleanup_free_ char *t = NULL, *s = NULL, *p = NULL;
size_t l;
int r;
const char *variable;
@@ -268,38 +131,26 @@ _public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat)
return -ENOMEM;
r = parse_env_file(p, NEWLINE, variable, &s, NULL);
- free(p);
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
- }
if (!s)
return -EIO;
- if (asprintf(&t, "%lu", (unsigned long) uid) < 0) {
- free(s);
+ if (asprintf(&t, "%lu", (unsigned long) uid) < 0)
return -ENOMEM;
- }
FOREACH_WORD(w, l, s, state) {
- if (strncmp(t, w, l) == 0) {
- free(s);
- free(t);
-
+ if (strneq(t, w, l))
return 1;
- }
}
- free(s);
- free(t);
-
return 0;
}
static int uid_get_array(uid_t uid, const char *variable, char ***array) {
- char *p, *s = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL;
char **a;
int r;
@@ -309,11 +160,7 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
r = parse_env_file(p, NEWLINE,
variable, &s,
NULL);
- free(p);
-
if (r < 0) {
- free(s);
-
if (r == -ENOENT) {
if (array)
*array = NULL;
@@ -330,7 +177,6 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
}
a = strv_split(s, " ");
- free(s);
if (!a)
return -ENOMEM;
@@ -347,11 +193,21 @@ static int uid_get_array(uid_t uid, const char *variable, char ***array) {
}
_public_ int sd_uid_get_sessions(uid_t uid, int require_active, char ***sessions) {
- return uid_get_array(uid, require_active ? "ACTIVE_SESSIONS" : "SESSIONS", sessions);
+ return uid_get_array(
+ uid,
+ require_active == 0 ? "ONLINE_SESSIONS" :
+ require_active > 0 ? "ACTIVE_SESSIONS" :
+ "SESSIONS",
+ sessions);
}
_public_ int sd_uid_get_seats(uid_t uid, int require_active, char ***seats) {
- return uid_get_array(uid, require_active ? "ACTIVE_SEATS" : "SEATS", seats);
+ return uid_get_array(
+ uid,
+ require_active == 0 ? "ONLINE_SEATS" :
+ require_active > 0 ? "ACTIVE_SEATS" :
+ "SEATS",
+ seats);
}
static int file_of_session(const char *session, char **_p) {
@@ -382,32 +238,52 @@ static int file_of_session(const char *session, char **_p) {
_public_ int sd_session_is_active(const char *session) {
int r;
- char *p, *s = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL;
r = file_of_session(session, &p);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
- free(p);
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
- }
if (!s)
return -EIO;
r = parse_boolean(s);
- free(s);
return r;
}
+_public_ int sd_session_get_state(const char *session, char **state) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
+ int r;
+
+ if (!state)
+ return -EINVAL;
+
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
+
+ if (r < 0)
+ return r;
+ else if (!s)
+ return -EIO;
+
+ *state = s;
+ s = NULL;
+
+ return 0;
+}
+
_public_ int sd_session_get_uid(const char *session, uid_t *uid) {
int r;
- char *p, *s = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL;
if (!uid)
return -EINVAL;
@@ -417,24 +293,20 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
return r;
r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
- free(p);
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
- }
if (!s)
return -EIO;
r = parse_uid(s, uid);
- free(s);
return r;
}
static int session_get_string(const char *session, const char *field, char **value) {
- char *p, *s = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL;
int r;
if (!value)
@@ -445,17 +317,15 @@ static int session_get_string(const char *session, const char *field, char **val
return r;
r = parse_env_file(p, NEWLINE, field, &s, NULL);
- free(p);
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
- }
if (isempty(s))
return -ENOENT;
*value = s;
+ s = NULL;
return 0;
}
@@ -463,6 +333,10 @@ _public_ int sd_session_get_seat(const char *session, char **seat) {
return session_get_string(session, "SEAT", seat);
}
+_public_ int sd_session_get_tty(const char *session, char **tty) {
+ return session_get_string(session, "TTY", tty);
+}
+
_public_ int sd_session_get_service(const char *session, char **service) {
return session_get_string(session, "SERVICE", service);
}
@@ -475,6 +349,10 @@ _public_ int sd_session_get_class(const char *session, char **class) {
return session_get_string(session, "CLASS", class);
}
+_public_ int sd_session_get_display(const char *session, char **display) {
+ return session_get_string(session, "DISPLAY", display);
+}
+
static int file_of_seat(const char *seat, char **_p) {
char *p;
int r;
@@ -484,25 +362,25 @@ static int file_of_seat(const char *seat, char **_p) {
if (seat)
p = strappend("/run/systemd/seats/", seat);
else {
- char *buf;
+ _cleanup_free_ char *buf = NULL;
r = sd_session_get_seat(NULL, &buf);
if (r < 0)
return r;
p = strappend("/run/systemd/seats/", buf);
- free(buf);
}
if (!p)
return -ENOMEM;
*_p = p;
+ p = NULL;
return 0;
}
_public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
- char *p, *s = NULL, *t = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
int r;
if (!session && !uid)
@@ -516,46 +394,33 @@ _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
"ACTIVE", &s,
"ACTIVE_UID", &t,
NULL);
- free(p);
-
- if (r < 0) {
- free(s);
- free(t);
+ if (r < 0)
return r;
- }
- if (session && !s) {
- free(t);
+ if (session && !s)
return -ENOENT;
- }
- if (uid && !t) {
- free(s);
+ if (uid && !t)
return -ENOENT;
- }
if (uid && t) {
r = parse_uid(t, uid);
- if (r < 0) {
- free(t);
- free(s);
+ if (r < 0)
return r;
- }
}
- free(t);
-
- if (session && s)
+ if (session && s) {
*session = s;
- else
- free(s);
+ s = NULL;
+ }
return 0;
}
_public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **uids, unsigned *n_uids) {
- char *p, *s = NULL, *t = NULL, **a = NULL;
- uid_t *b = NULL;
+ _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
+ _cleanup_strv_free_ char **a = NULL;
+ _cleanup_free_ uid_t *b = NULL;
unsigned n = 0;
int r;
@@ -567,25 +432,16 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
"SESSIONS", &s,
"ACTIVE_SESSIONS", &t,
NULL);
- free(p);
- if (r < 0) {
- free(s);
- free(t);
+ if (r < 0)
return r;
- }
if (s) {
a = strv_split(s, " ");
- if (!a) {
- free(s);
- free(t);
+ if (!a)
return -ENOMEM;
- }
}
- free(s);
-
if (uids && t) {
char *w, *state;
size_t l;
@@ -593,30 +449,22 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
FOREACH_WORD(w, l, t, state)
n++;
- if (n == 0)
- b = NULL;
- else {
+ if (n > 0) {
unsigned i = 0;
b = new(uid_t, n);
- if (!b) {
- strv_free(a);
+ if (!b)
return -ENOMEM;
- }
FOREACH_WORD(w, l, t, state) {
- char *k;
+ _cleanup_free_ char *k = NULL;
k = strndup(w, l);
- if (!k) {
- free(t);
- free(b);
- strv_free(a);
+ if (!k)
return -ENOMEM;
- }
r = parse_uid(k, b + i);
- free(k);
+
if (r < 0)
continue;
@@ -625,17 +473,17 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
}
}
- free(t);
-
r = strv_length(a);
- if (sessions)
+ if (sessions) {
*sessions = a;
- else
- strv_free(a);
+ a = NULL;
+ }
- if (uids)
+ if (uids) {
*uids = b;
+ b = NULL;
+ }
if (n_uids)
*n_uids = n;
@@ -643,8 +491,8 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
return r;
}
-_public_ int sd_seat_can_multi_session(const char *seat) {
- char *p, *s = NULL;
+static int seat_get_can(const char *seat, const char *variable) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
int r;
r = file_of_seat(seat, &p);
@@ -652,24 +500,31 @@ _public_ int sd_seat_can_multi_session(const char *seat) {
return r;
r = parse_env_file(p, NEWLINE,
- "CAN_MULTI_SESSION", &s,
+ variable, &s,
NULL);
- free(p);
-
- if (r < 0) {
- free(s);
+ if (r < 0)
return r;
- }
- if (s) {
+ if (s)
r = parse_boolean(s);
- free(s);
- } else
+ else
r = 0;
return r;
}
+_public_ int sd_seat_can_multi_session(const char *seat) {
+ return seat_get_can(seat, "CAN_MULTI_SESSION");
+}
+
+_public_ int sd_seat_can_tty(const char *seat) {
+ return seat_get_can(seat, "CAN_TTY");
+}
+
+_public_ int sd_seat_can_graphical(const char *seat) {
+ return seat_get_can(seat, "CAN_GRAPHICAL");
+}
+
_public_ int sd_get_seats(char ***seats) {
return get_files_in_directory("/run/systemd/seats/", seats);
}
@@ -679,25 +534,24 @@ _public_ int sd_get_sessions(char ***sessions) {
}
_public_ int sd_get_uids(uid_t **users) {
- DIR *d;
+ _cleanup_closedir_ DIR *d;
int r = 0;
unsigned n = 0;
- uid_t *l = NULL;
+ _cleanup_free_ uid_t *l = NULL;
d = opendir("/run/systemd/users/");
if (!d)
return -errno;
for (;;) {
- struct dirent buffer, *de;
+ struct dirent *de;
+ union dirent_storage buf;
int k;
uid_t uid;
- k = readdir_r(d, &buffer, &de);
- if (k != 0) {
- r = -k;
- goto finish;
- }
+ k = readdir_r(d, &buf.de, &de);
+ if (k != 0)
+ return -k;
if (!de)
break;
@@ -717,10 +571,8 @@ _public_ int sd_get_uids(uid_t **users) {
n = MAX(16, 2*r);
t = realloc(l, sizeof(uid_t) * n);
- if (!t) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!t)
+ return -ENOMEM;
l = t;
}
@@ -731,19 +583,51 @@ _public_ int sd_get_uids(uid_t **users) {
r++;
}
-finish:
- if (d)
- closedir(d);
-
- if (r >= 0) {
- if (users)
- *users = l;
- } else
- free(l);
+ if (users) {
+ *users = l;
+ l = NULL;
+ }
return r;
}
+int sd_get_machine_names(char ***machines) {
+ _cleanup_closedir_ DIR *d = NULL;
+ _cleanup_strv_free_ char **l = NULL;
+ _cleanup_free_ char *md = NULL;
+ char *n;
+ int c = 0, r;
+
+ r = cg_get_machine_path(NULL, &md);
+ if (r < 0)
+ return r;
+
+ r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, md, &d);
+ if (r < 0)
+ return r;
+
+ while ((r = cg_read_subgroup(d, &n)) > 0) {
+
+ r = strv_push(&l, n);
+ if (r < 0) {
+ free(n);
+ return -ENOMEM;
+ }
+
+ c++;
+ }
+
+ if (r < 0)
+ return r;
+
+ if (machines) {
+ *machines = l;
+ l = NULL;
+ }
+
+ return c;
+}
+
static inline int MONITOR_TO_FD(sd_login_monitor *m) {
return (int) (unsigned long) m - 1;
}
@@ -761,7 +645,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
if (fd < 0)
- return errno;
+ return -errno;
if (!category || streq(category, "seat")) {
k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
@@ -793,6 +677,27 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
good = true;
}
+ if (!category || streq(category, "machine")) {
+ _cleanup_free_ char *md = NULL, *p = NULL;
+ int r;
+
+ r = cg_get_machine_path(NULL, &md);
+ if (r < 0)
+ return r;
+
+ r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, md, NULL, &p);
+ if (r < 0)
+ return r;
+
+ k = inotify_add_watch(fd, p, IN_MOVED_TO|IN_CREATE|IN_DELETE);
+ if (k < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ good = true;
+ }
+
if (!good) {
close_nointr(fd);
return -EINVAL;
@@ -829,3 +734,29 @@ _public_ int sd_login_monitor_get_fd(sd_login_monitor *m) {
return MONITOR_TO_FD(m);
}
+
+_public_ int sd_login_monitor_get_events(sd_login_monitor *m) {
+
+ if (!m)
+ return -EINVAL;
+
+ /* For now we will only return POLLIN here, since we don't
+ * need anything else ever for inotify. However, let's have
+ * this API to keep our options open should we later on need
+ * it. */
+ return POLLIN;
+}
+
+_public_ int sd_login_monitor_get_timeout(sd_login_monitor *m, uint64_t *timeout_usec) {
+
+ if (!m)
+ return -EINVAL;
+ if (!timeout_usec)
+ return -EINVAL;
+
+ /* For now we will only return (uint64_t) -1, since we don't
+ * need any timeout. However, let's have this API to keep our
+ * options open should we later on need it. */
+ *timeout_usec = (uint64_t) -1;
+ return 0;
+}