X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Fsd-login.c;h=7513f76cb3fc3397da3389dd81208abc3d14e12c;hb=50fb97935d689a520251b2d543599be14bdfd0ed;hp=e857ae08d2c8f73ecbcfc8105b6af1df10dd1b87;hpb=addedec48ba0ffc4472ef6d3b5a45c9d4239f1cd;p=elogind.git
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index e857ae08d..7513f76cb 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,74 +23,26 @@
#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);
+ r = cg_pid_get_cgroup(pid, NULL, &cgroup);
if (r < 0)
return r;
@@ -121,31 +73,15 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) {
return 0;
}
-_public_ int sd_pid_get_service(pid_t pid, char **service) {
- int r;
- char *cgroup, *p;
+_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
- if (!service)
+ if (pid < 0)
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;
- p = strndup(p, strcspn(p, "/"));
- free(cgroup);
-
- if (!p)
- return -ENOMEM;
+ if (!unit)
+ return -EINVAL;
- *service = p;
- return 0;
+ return cg_pid_get_unit(pid, unit);
}
_public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
@@ -153,10 +89,13 @@ _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
char *root, *cgroup, *p, *cc;
struct stat st;
+ if (pid < 0)
+ return -EINVAL;
+
if (!uid)
return -EINVAL;
- r = pid_get_cgroup(pid, &root, &cgroup);
+ r = cg_pid_get_cgroup(pid, &root, &cgroup);
if (r < 0)
return r;
@@ -259,7 +198,7 @@ _public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat)
}
FOREACH_WORD(w, l, s, state) {
- if (strncmp(t, w, l) == 0) {
+ if (strneq(t, w, l)) {
free(s);
free(t);
@@ -322,24 +261,57 @@ 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);
}
-_public_ int sd_session_is_active(const char *session) {
+static int file_of_session(const char *session, char **_p) {
+ char *p;
int r;
- char *p, *s = NULL;
- if (!session)
- return -EINVAL;
+ assert(_p);
+
+ if (session)
+ p = strappend("/run/systemd/sessions/", session);
+ else {
+ char *buf;
+
+ r = sd_pid_get_session(0, &buf);
+ if (r < 0)
+ return r;
+
+ p = strappend("/run/systemd/sessions/", buf);
+ free(buf);
+ }
- p = strappend("/run/systemd/sessions/", session);
if (!p)
return -ENOMEM;
+ *_p = p;
+ return 0;
+}
+
+_public_ int sd_session_is_active(const char *session) {
+ int r;
+ char *p, *s = NULL;
+
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
+
r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
free(p);
@@ -357,18 +329,40 @@ _public_ int sd_session_is_active(const char *session) {
return r;
}
+_public_ int sd_session_get_state(const char *session, char **state) {
+ char *p, *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);
+ free(p);
+
+ if (r < 0) {
+ free(s);
+ return r;
+ } else if (!s)
+ return -EIO;
+
+ *state = s;
+ return 0;
+}
+
_public_ int sd_session_get_uid(const char *session, uid_t *uid) {
int r;
char *p, *s = NULL;
- if (!session)
- return -EINVAL;
if (!uid)
return -EINVAL;
- p = strappend("/run/systemd/sessions/", session);
- if (!p)
- return -ENOMEM;
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
free(p);
@@ -387,20 +381,18 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
return r;
}
-_public_ int sd_session_get_seat(const char *session, char **seat) {
+static int session_get_string(const char *session, const char *field, char **value) {
char *p, *s = NULL;
int r;
- if (!session)
- return -EINVAL;
- if (!seat)
+ if (!value)
return -EINVAL;
- p = strappend("/run/systemd/sessions/", session);
- if (!p)
- return -ENOMEM;
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
- r = parse_env_file(p, NEWLINE, "SEAT", &s, NULL);
+ r = parse_env_file(p, NEWLINE, field, &s, NULL);
free(p);
if (r < 0) {
@@ -411,7 +403,57 @@ _public_ int sd_session_get_seat(const char *session, char **seat) {
if (isempty(s))
return -ENOENT;
- *seat = s;
+ *value = s;
+ return 0;
+}
+
+_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);
+}
+
+_public_ int sd_session_get_type(const char *session, char **type) {
+ return session_get_string(session, "TYPE", type);
+}
+
+_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;
+
+ assert(_p);
+
+ if (seat)
+ p = strappend("/run/systemd/seats/", seat);
+ else {
+ char *buf;
+
+ 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;
return 0;
}
@@ -419,14 +461,12 @@ _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
char *p, *s = NULL, *t = NULL;
int r;
- if (!seat)
- return -EINVAL;
if (!session && !uid)
return -EINVAL;
- p = strappend("/run/systemd/seats/", seat);
- if (!p)
- return -ENOMEM;
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
r = parse_env_file(p, NEWLINE,
"ACTIVE", &s,
@@ -475,12 +515,9 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
unsigned n = 0;
int r;
- if (!seat)
- return -EINVAL;
-
- p = strappend("/run/systemd/seats/", seat);
- if (!p)
- return -ENOMEM;
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
r = parse_env_file(p, NEWLINE,
"SESSIONS", &s,
@@ -562,19 +599,16 @@ _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) {
+static int seat_get_can(const char *seat, const char *variable) {
char *p, *s = NULL;
int r;
- if (!seat)
- return -EINVAL;
-
- p = strappend("/run/systemd/seats/", seat);
- if (!p)
- return -ENOMEM;
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
r = parse_env_file(p, NEWLINE,
- "CAN_MULTI_SESSION", &s,
+ variable, &s,
NULL);
free(p);
@@ -592,6 +626,18 @@ _public_ int sd_seat_can_multi_session(const char *seat) {
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);
}
@@ -611,11 +657,12 @@ _public_ int sd_get_uids(uid_t **users) {
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);
+ k = readdir_r(d, &buf.de, &de);
if (k != 0) {
r = -k;
goto finish;
@@ -751,3 +798,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;
+}