[systemd-commits] Makefile.am src/libsystemd src/login src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Mar 17 10:37:07 PDT 2014
Makefile.am | 20
src/libsystemd/sd-login/sd-login.c | 870 +++++++++++++++++++++++++++++++++++
src/libsystemd/sd-login/test-login.c | 246 +++++++++
src/login/login-shared.c | 29 -
src/login/login-shared.h | 24
src/login/sd-login.c | 870 -----------------------------------
src/login/test-login.c | 246 ---------
src/shared/login-shared.c | 29 +
src/shared/login-shared.h | 24
9 files changed, 1177 insertions(+), 1181 deletions(-)
New commits:
commit 58dfc42ecfa95f2b859790d726bfae2feea1faa9
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 17 18:28:30 2014 +0100
build-sys: move sd-login src/login → src/libsystemd/sd-login
After all, it is ultimately linked to libsystems.so anyway, thus belongs
there and shares very little with the rest of logind, hence let's move
this away.
diff --git a/Makefile.am b/Makefile.am
index 4f94587..f0cfe46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -797,7 +797,9 @@ libsystemd_shared_la_SOURCES = \
src/shared/generator.h \
src/shared/generator.c \
src/shared/clean-ipc.h \
- src/shared/clean-ipc.c
+ src/shared/clean-ipc.c \
+ src/shared/login-shared.c \
+ src/shared/login-shared.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@ -2108,9 +2110,7 @@ libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-resolve/resolve-util.h \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
- src/login/sd-login.c \
- src/login/login-shared.c \
- src/login/login-shared.h
+ src/libsystemd/sd-login/sd-login.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym \
@@ -2753,10 +2753,8 @@ if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
src/login/logind-acl.c \
- src/login/sd-login.c \
- src/systemd/sd-login.h \
- src/login/login-shared.c \
- src/login/login-shared.h
+ src/libsystemd/sd-login/sd-login.c \
+ src/systemd/sd-login.h
libudev_core_la_LIBADD += \
libsystemd-acl.la
@@ -4221,9 +4219,7 @@ libsystemd_logind_core_la_SOURCES = \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
- src/login/logind-acl.h \
- src/login/login-shared.c \
- src/login/login-shared.h
+ src/login/logind-acl.h
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
@@ -4283,7 +4279,7 @@ rootbin_PROGRAMS += \
systemd-inhibit
test_login_SOURCES = \
- src/login/test-login.c
+ src/libsystemd/sd-login/test-login.c
test_login_LDADD = \
libsystemd-internal.la \
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
new file mode 100644
index 0000000..d24b2ed
--- /dev/null
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -0,0 +1,870 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2011 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/inotify.h>
+#include <sys/poll.h>
+
+#include "util.h"
+#include "cgroup-util.h"
+#include "macro.h"
+#include "strv.h"
+#include "fileio.h"
+#include "login-shared.h"
+#include "sd-login.h"
+
+_public_ int sd_pid_get_session(pid_t pid, char **session) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(session, -EINVAL);
+
+ return cg_pid_get_session(pid, session);
+}
+
+_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(unit, -EINVAL);
+
+ return cg_pid_get_unit(pid, unit);
+}
+
+_public_ int sd_pid_get_user_unit(pid_t pid, char **unit) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(unit, -EINVAL);
+
+ return cg_pid_get_user_unit(pid, unit);
+}
+
+_public_ int sd_pid_get_machine_name(pid_t pid, char **name) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(name, -EINVAL);
+
+ return cg_pid_get_machine_name(pid, name);
+}
+
+_public_ int sd_pid_get_slice(pid_t pid, char **slice) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(slice, -EINVAL);
+
+ return cg_pid_get_slice(pid, slice);
+}
+
+_public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
+
+ assert_return(pid >= 0, -EINVAL);
+ assert_return(uid, -EINVAL);
+
+ return cg_pid_get_owner_uid(pid, uid);
+}
+
+_public_ int sd_peer_get_session(int fd, char **session) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(session, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_session(ucred.pid, session);
+}
+
+_public_ int sd_peer_get_owner_uid(int fd, uid_t *uid) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(uid, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_owner_uid(ucred.pid, uid);
+}
+
+_public_ int sd_peer_get_unit(int fd, char **unit) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(unit, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_unit(ucred.pid, unit);
+}
+
+_public_ int sd_peer_get_user_unit(int fd, char **unit) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(unit, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_user_unit(ucred.pid, unit);
+}
+
+_public_ int sd_peer_get_machine_name(int fd, char **machine) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(machine, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_machine_name(ucred.pid, machine);
+}
+
+_public_ int sd_peer_get_slice(int fd, char **slice) {
+ struct ucred ucred;
+ int r;
+
+ assert_return(fd >= 0, -EINVAL);
+ assert_return(slice, -EINVAL);
+
+ r = getpeercred(fd, &ucred);
+ if (r < 0)
+ return r;
+
+ return cg_pid_get_slice(ucred.pid, slice);
+}
+
+_public_ int sd_uid_get_state(uid_t uid, char**state) {
+ _cleanup_free_ char *p = NULL;
+ char *s = NULL;
+ int r;
+
+ assert_return(state, -EINVAL);
+
+ if (asprintf(&p, "/run/systemd/users/%lu", (unsigned long) uid) < 0)
+ return -ENOMEM;
+
+ r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
+ if (r == -ENOENT) {
+ free(s);
+ s = strdup("offline");
+ if (!s)
+ return -ENOMEM;
+
+ } else if (r < 0) {
+ free(s);
+ return r;
+ } else if (!s)
+ return -EIO;
+
+ *state = s;
+ return 0;
+}
+
+_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) {
+ char *w, *state;
+ _cleanup_free_ char *t = NULL, *s = NULL, *p = NULL;
+ size_t l;
+ int r;
+ const char *variable;
+
+ assert_return(seat, -EINVAL);
+
+ variable = require_active ? "ACTIVE_UID" : "UIDS";
+
+ p = strappend("/run/systemd/seats/", seat);
+ if (!p)
+ return -ENOMEM;
+
+ r = parse_env_file(p, NEWLINE, variable, &s, NULL);
+
+ if (r < 0)
+ return r;
+
+ if (!s)
+ return -EIO;
+
+ if (asprintf(&t, "%lu", (unsigned long) uid) < 0)
+ return -ENOMEM;
+
+ FOREACH_WORD(w, l, s, state) {
+ if (strneq(t, w, l))
+ return 1;
+ }
+
+ return 0;
+}
+
+static int uid_get_array(uid_t uid, const char *variable, char ***array) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
+ char **a;
+ int r;
+
+ if (asprintf(&p, "/run/systemd/users/%lu", (unsigned long) uid) < 0)
+ return -ENOMEM;
+
+ r = parse_env_file(p, NEWLINE,
+ variable, &s,
+ NULL);
+ if (r < 0) {
+ if (r == -ENOENT) {
+ if (array)
+ *array = NULL;
+ return 0;
+ }
+
+ return r;
+ }
+
+ if (!s) {
+ if (array)
+ *array = NULL;
+ return 0;
+ }
+
+ a = strv_split(s, " ");
+
+ if (!a)
+ return -ENOMEM;
+
+ strv_uniq(a);
+ r = strv_length(a);
+
+ if (array)
+ *array = a;
+ else
+ strv_free(a);
+
+ return r;
+}
+
+_public_ int sd_uid_get_sessions(uid_t uid, int require_active, char ***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 == 0 ? "ONLINE_SEATS" :
+ require_active > 0 ? "ACTIVE_SEATS" :
+ "SEATS",
+ seats);
+}
+
+static int file_of_session(const char *session, char **_p) {
+ char *p;
+ int r;
+
+ assert(_p);
+
+ if (session) {
+ if (!session_id_valid(session))
+ return -EINVAL;
+
+ p = strappend("/run/systemd/sessions/", session);
+ } else {
+ _cleanup_free_ char *buf = NULL;
+
+ r = sd_pid_get_session(0, &buf);
+ if (r < 0)
+ return r;
+
+ p = strappend("/run/systemd/sessions/", buf);
+ }
+
+ if (!p)
+ return -ENOMEM;
+
+ *_p = p;
+ return 0;
+}
+
+_public_ int sd_session_is_active(const char *session) {
+ int r;
+ _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);
+ if (r < 0)
+ return r;
+
+ if (!s)
+ return -EIO;
+
+ return parse_boolean(s);
+}
+
+_public_ int sd_session_is_remote(const char *session) {
+ int r;
+ _cleanup_free_ char *p = NULL, *s = NULL;
+
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE, "REMOTE", &s, NULL);
+ if (r < 0)
+ return r;
+
+ if (!s)
+ return -EIO;
+
+ return parse_boolean(s);
+}
+
+_public_ int sd_session_get_state(const char *session, char **state) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
+ int r;
+
+ assert_return(state, -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;
+ _cleanup_free_ char *p = NULL, *s = NULL;
+
+ assert_return(uid, -EINVAL);
+
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
+ if (r < 0)
+ return r;
+
+ if (!s)
+ return -EIO;
+
+ return parse_uid(s, uid);
+}
+
+static int session_get_string(const char *session, const char *field, char **value) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
+ int r;
+
+ assert_return(value, -EINVAL);
+
+ r = file_of_session(session, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE, field, &s, NULL);
+
+ if (r < 0)
+ return r;
+
+ if (isempty(s))
+ return -ENOENT;
+
+ *value = s;
+ s = NULL;
+ 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_vt(const char *session, unsigned *vtnr) {
+ _cleanup_free_ char *vtnr_string = NULL;
+ unsigned u;
+ int r;
+
+ r = session_get_string(session, "VTNR", &vtnr_string);
+ if (r < 0)
+ return r;
+
+ r = safe_atou(vtnr_string, &u);
+ if (r < 0)
+ return r;
+
+ *vtnr = u;
+ return 0;
+}
+
+_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);
+}
+
+_public_ int sd_session_get_remote_user(const char *session, char **remote_user) {
+ return session_get_string(session, "REMOTE_USER", remote_user);
+}
+
+_public_ int sd_session_get_remote_host(const char *session, char **remote_host) {
+ return session_get_string(session, "REMOTE_HOST", remote_host);
+}
+
+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 {
+ _cleanup_free_ char *buf = NULL;
+
+ r = sd_session_get_seat(NULL, &buf);
+ if (r < 0)
+ return r;
+
+ p = strappend("/run/systemd/seats/", 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) {
+ _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
+ int r;
+
+ assert_return(session || uid, -EINVAL);
+
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE,
+ "ACTIVE", &s,
+ "ACTIVE_UID", &t,
+ NULL);
+ if (r < 0)
+ return r;
+
+ if (session && !s)
+ return -ENOENT;
+
+ if (uid && !t)
+ return -ENOENT;
+
+ if (uid && t) {
+ r = parse_uid(t, uid);
+ if (r < 0)
+ return r;
+ }
+
+ if (session && s) {
+ *session = s;
+ s = NULL;
+ }
+
+ return 0;
+}
+
+_public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **uids, unsigned *n_uids) {
+ _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;
+
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE,
+ "SESSIONS", &s,
+ "ACTIVE_SESSIONS", &t,
+ NULL);
+
+ if (r < 0)
+ return r;
+
+ if (s) {
+ a = strv_split(s, " ");
+ if (!a)
+ return -ENOMEM;
+ }
+
+ if (uids && t) {
+ char *w, *state;
+ size_t l;
+
+ FOREACH_WORD(w, l, t, state)
+ n++;
+
+ if (n > 0) {
+ unsigned i = 0;
+
+ b = new(uid_t, n);
+ if (!b)
+ return -ENOMEM;
+
+ FOREACH_WORD(w, l, t, state) {
+ _cleanup_free_ char *k = NULL;
+
+ k = strndup(w, l);
+ if (!k)
+ return -ENOMEM;
+
+ r = parse_uid(k, b + i);
+
+ if (r < 0)
+ continue;
+
+ i++;
+ }
+ }
+ }
+
+ r = strv_length(a);
+
+ if (sessions) {
+ *sessions = a;
+ a = NULL;
+ }
+
+ if (uids) {
+ *uids = b;
+ b = NULL;
+ }
+
+ if (n_uids)
+ *n_uids = n;
+
+ return r;
+}
+
+static int seat_get_can(const char *seat, const char *variable) {
+ _cleanup_free_ char *p = NULL, *s = NULL;
+ int r;
+
+ assert_return(variable, -EINVAL);
+
+ r = file_of_seat(seat, &p);
+ if (r < 0)
+ return r;
+
+ r = parse_env_file(p, NEWLINE,
+ variable, &s,
+ NULL);
+ if (r < 0)
+ return r;
+ if (!s)
+ return 0;
+
+ return parse_boolean(s);
+}
+
+_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);
+}
+
+_public_ int sd_get_sessions(char ***sessions) {
+ return get_files_in_directory("/run/systemd/sessions/", sessions);
+}
+
+_public_ int sd_get_uids(uid_t **users) {
+ _cleanup_closedir_ DIR *d;
+ int r = 0;
+ unsigned n = 0;
+ _cleanup_free_ uid_t *l = NULL;
+
+ d = opendir("/run/systemd/users/");
+ if (!d)
+ return -errno;
+
+ for (;;) {
+ struct dirent *de;
+ int k;
+ uid_t uid;
+
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0)
+ return -errno;
+
+ if (!de)
+ break;
+
+ dirent_ensure_type(d, de);
+
+ if (!dirent_is_file(de))
+ continue;
+
+ k = parse_uid(de->d_name, &uid);
+ if (k < 0)
+ continue;
+
+ if (users) {
+ if ((unsigned) r >= n) {
+ uid_t *t;
+
+ n = MAX(16, 2*r);
+ t = realloc(l, sizeof(uid_t) * n);
+ if (!t)
+ return -ENOMEM;
+
+ l = t;
+ }
+
+ assert((unsigned) r < n);
+ l[r++] = uid;
+ } else
+ r++;
+ }
+
+ if (users) {
+ *users = l;
+ l = NULL;
+ }
+
+ return r;
+}
+
+_public_ int sd_get_machine_names(char ***machines) {
+ char **l = NULL, **a, **b;
+ int r;
+
+ assert_return(machines, -EINVAL);
+
+ r = get_files_in_directory("/run/systemd/machines/", &l);
+ if (r < 0)
+ return r;
+
+ if (l) {
+ r = 0;
+
+ /* Filter out the unit: symlinks */
+ for (a = l, b = l; *a; a++) {
+ if (startswith(*a, "unit:"))
+ free(*a);
+ else {
+ *b = *a;
+ b++;
+ r++;
+ }
+ }
+
+ *b = NULL;
+ }
+
+ *machines = l;
+ return r;
+}
+
+_public_ int sd_machine_get_class(const char *machine, char **class) {
+ _cleanup_free_ char *c = NULL;
+ const char *p;
+ int r;
+
+ assert_return(filename_is_safe(machine), -EINVAL);
+ assert_return(class, -EINVAL);
+
+ p = strappenda("/run/systemd/machines/", machine);
+ r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL);
+ if (r < 0)
+ return r;
+ if (!c)
+ return -EIO;
+
+ *class = c;
+ c = NULL;
+
+ return 0;
+}
+
+static inline int MONITOR_TO_FD(sd_login_monitor *m) {
+ return (int) (unsigned long) m - 1;
+}
+
+static inline sd_login_monitor* FD_TO_MONITOR(int fd) {
+ return (sd_login_monitor*) (unsigned long) (fd + 1);
+}
+
+_public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
+ int fd, k;
+ bool good = false;
+
+ assert_return(m, -EINVAL);
+
+ fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
+ if (fd < 0)
+ return -errno;
+
+ if (!category || streq(category, "seat")) {
+ k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
+ if (k < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ good = true;
+ }
+
+ if (!category || streq(category, "session")) {
+ k = inotify_add_watch(fd, "/run/systemd/sessions/", IN_MOVED_TO|IN_DELETE);
+ if (k < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ good = true;
+ }
+
+ if (!category || streq(category, "uid")) {
+ k = inotify_add_watch(fd, "/run/systemd/users/", IN_MOVED_TO|IN_DELETE);
+ if (k < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ good = true;
+ }
+
+ if (!category || streq(category, "machine")) {
+ k = inotify_add_watch(fd, "/run/systemd/machines/", IN_MOVED_TO|IN_DELETE);
+ if (k < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ good = true;
+ }
+
+ if (!good) {
+ close_nointr(fd);
+ return -EINVAL;
+ }
+
+ *m = FD_TO_MONITOR(fd);
+ return 0;
+}
+
+_public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) {
+ int fd;
+
+ assert_return(m, NULL);
+
+ fd = MONITOR_TO_FD(m);
+ close_nointr(fd);
+
+ return NULL;
+}
+
+_public_ int sd_login_monitor_flush(sd_login_monitor *m) {
+
+ assert_return(m, -EINVAL);
+
+ return flush_fd(MONITOR_TO_FD(m));
+}
+
+_public_ int sd_login_monitor_get_fd(sd_login_monitor *m) {
+
+ assert_return(m, -EINVAL);
+
+ return MONITOR_TO_FD(m);
+}
+
+_public_ int sd_login_monitor_get_events(sd_login_monitor *m) {
+
+ assert_return(m, -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) {
+
+ assert_return(m, -EINVAL);
+ assert_return(timeout_usec, -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;
+}
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
new file mode 100644
index 0000000..2ab083b
--- /dev/null
+++ b/src/libsystemd/sd-login/test-login.c
@@ -0,0 +1,246 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2011 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <sys/poll.h>
+#include <string.h>
+
+#include <systemd/sd-login.h>
+
+#include "util.h"
+#include "strv.h"
+
+static void test_login(void) {
+ _cleanup_close_pipe_ int pair[2] = { -1, -1 };
+ _cleanup_free_ char *pp = NULL, *qq = NULL;
+ int r, k;
+ uid_t u, u2;
+ char *seat, *type, *class, *display, *remote_user, *remote_host;
+ char *session;
+ char *state;
+ char *session2;
+ char *t;
+ char **seats, **sessions, **machines;
+ uid_t *uids;
+ unsigned n;
+ struct pollfd pollfd;
+ sd_login_monitor *m = NULL;
+
+ assert_se(sd_pid_get_session(0, &session) == 0);
+ printf("session = %s\n", session);
+
+ assert_se(sd_pid_get_owner_uid(0, &u2) == 0);
+ printf("user = %lu\n", (unsigned long) u2);
+
+ assert_se(socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == 0);
+ sd_peer_get_session(pair[0], &pp);
+ sd_peer_get_session(pair[1], &qq);
+ assert_se(streq_ptr(pp, qq));
+
+ r = sd_uid_get_sessions(u2, false, &sessions);
+ assert_se(r >= 0);
+ assert_se(r == (int) strv_length(sessions));
+ assert_se(t = strv_join(sessions, ", "));
+ strv_free(sessions);
+ printf("sessions = %s\n", t);
+ free(t);
+
+ assert_se(r == sd_uid_get_sessions(u2, false, NULL));
+
+ r = sd_uid_get_seats(u2, false, &seats);
+ assert_se(r >= 0);
+ assert_se(r == (int) strv_length(seats));
+ assert_se(t = strv_join(seats, ", "));
+ strv_free(seats);
+ printf("seats = %s\n", t);
+ free(t);
+
+ assert_se(r == sd_uid_get_seats(u2, false, NULL));
+
+ r = sd_session_is_active(session);
+ assert_se(r >= 0);
+ printf("active = %s\n", yes_no(r));
+
+ r = sd_session_is_remote(session);
+ assert_se(r >= 0);
+ printf("remote = %s\n", yes_no(r));
+
+ r = sd_session_get_state(session, &state);
+ assert_se(r >= 0);
+ printf("state = %s\n", state);
+ free(state);
+
+ assert_se(sd_session_get_uid(session, &u) >= 0);
+ printf("uid = %lu\n", (unsigned long) u);
+ assert_se(u == u2);
+
+ assert_se(sd_session_get_type(session, &type) >= 0);
+ printf("type = %s\n", type);
+ free(type);
+
+ assert_se(sd_session_get_class(session, &class) >= 0);
+ printf("class = %s\n", class);
+ free(class);
+
+ assert_se(sd_session_get_display(session, &display) >= 0);
+ printf("display = %s\n", display);
+ free(display);
+
+ assert_se(sd_session_get_remote_user(session, &remote_user) >= 0);
+ printf("remote_user = %s\n", remote_user);
+ free(remote_user);
+
+ assert_se(sd_session_get_remote_host(session, &remote_host) >= 0);
+ printf("remote_host = %s\n", remote_host);
+ free(remote_host);
+
+ assert_se(sd_session_get_seat(session, &seat) >= 0);
+ printf("seat = %s\n", seat);
+
+ r = sd_seat_can_multi_session(seat);
+ assert_se(r >= 0);
+ printf("can do multi session = %s\n", yes_no(r));
+
+ r = sd_seat_can_tty(seat);
+ assert_se(r >= 0);
+ printf("can do tty = %s\n", yes_no(r));
+
+ r = sd_seat_can_graphical(seat);
+ assert_se(r >= 0);
+ printf("can do graphical = %s\n", yes_no(r));
+
+ assert_se(sd_uid_get_state(u, &state) >= 0);
+ printf("state = %s\n", state);
+
+ assert_se(sd_uid_is_on_seat(u, 0, seat) > 0);
+
+ k = sd_uid_is_on_seat(u, 1, seat);
+ assert_se(k >= 0);
+ assert_se(!!r == !!r);
+
+ assert_se(sd_seat_get_active(seat, &session2, &u2) >= 0);
+ printf("session2 = %s\n", session2);
+ printf("uid2 = %lu\n", (unsigned long) u2);
+
+ r = sd_seat_get_sessions(seat, &sessions, &uids, &n);
+ assert_se(r >= 0);
+ printf("n_sessions = %i\n", r);
+ assert_se(r == (int) strv_length(sessions));
+ assert_se(t = strv_join(sessions, ", "));
+ strv_free(sessions);
+ printf("sessions = %s\n", t);
+ free(t);
+ printf("uids =");
+ for (k = 0; k < (int) n; k++)
+ printf(" %lu", (unsigned long) uids[k]);
+ printf("\n");
+ free(uids);
+
+ assert_se(sd_seat_get_sessions(seat, NULL, NULL, NULL) == r);
+
+ free(session);
+ free(state);
+ free(session2);
+ free(seat);
+
+ r = sd_get_seats(&seats);
+ assert_se(r >= 0);
+ assert_se(r == (int) strv_length(seats));
+ assert_se(t = strv_join(seats, ", "));
+ strv_free(seats);
+ printf("n_seats = %i\n", r);
+ printf("seats = %s\n", t);
+ free(t);
+
+ assert_se(sd_get_seats(NULL) == r);
+
+ r = sd_seat_get_active(NULL, &t, NULL);
+ assert_se(r >= 0);
+ printf("active session on current seat = %s\n", t);
+ free(t);
+
+ r = sd_get_sessions(&sessions);
+ assert_se(r >= 0);
+ assert_se(r == (int) strv_length(sessions));
+ assert_se(t = strv_join(sessions, ", "));
+ strv_free(sessions);
+ printf("n_sessions = %i\n", r);
+ printf("sessions = %s\n", t);
+ free(t);
+
+ assert_se(sd_get_sessions(NULL) == r);
+
+ r = sd_get_uids(&uids);
+ assert_se(r >= 0);
+
+ printf("uids =");
+ for (k = 0; k < r; k++)
+ printf(" %lu", (unsigned long) uids[k]);
+ printf("\n");
+ free(uids);
+
+ printf("n_uids = %i\n", r);
+ assert_se(sd_get_uids(NULL) == r);
+
+ r = sd_get_machine_names(&machines);
+ assert_se(r >= 0);
+ assert_se(r == (int) strv_length(machines));
+ assert_se(t = strv_join(machines, ", "));
+ strv_free(machines);
+ printf("n_machines = %i\n", r);
+ printf("machines = %s\n", t);
+ free(t);
+
+ r = sd_login_monitor_new("session", &m);
+ assert_se(r >= 0);
+
+ for (n = 0; n < 5; n++) {
+ usec_t timeout, nw;
+
+ zero(pollfd);
+ assert_se((pollfd.fd = sd_login_monitor_get_fd(m)) >= 0);
+ assert_se((pollfd.events = sd_login_monitor_get_events(m)) >= 0);
+
+ assert_se(sd_login_monitor_get_timeout(m, &timeout) >= 0);
+
+ nw = now(CLOCK_MONOTONIC);
+
+ r = poll(&pollfd, 1,
+ timeout == (uint64_t) -1 ? -1 :
+ timeout > nw ? (int) ((timeout - nw) / 1000) :
+ 0);
+
+ assert_se(r >= 0);
+
+ sd_login_monitor_flush(m);
+ printf("Wake!\n");
+ }
+
+ sd_login_monitor_unref(m);
+}
+
+int main(int argc, char* argv[]) {
+ log_parse_environment();
+ log_open();
+
+ test_login();
+
+ return 0;
+}
diff --git a/src/login/login-shared.c b/src/login/login-shared.c
deleted file mode 100644
index 054c775..0000000
--- a/src/login/login-shared.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Zbigniew Jędrzejewski-Szmek
-
- systemd is free software; you can redistribute it and/or modify it
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "login-shared.h"
-#include "def.h"
-
-bool session_id_valid(const char *id) {
- assert(id);
-
- return id[0] && id[strspn(id, LETTERS DIGITS)] == '\0';
-}
diff --git a/src/login/login-shared.h b/src/login/login-shared.h
deleted file mode 100644
index b2787c9..0000000
--- a/src/login/login-shared.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2013 Zbigniew Jędrzejewski-Szmek
-
- systemd is free software; you can redistribute it and/or modify it
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdbool.h>
-
-bool session_id_valid(const char *id);
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
deleted file mode 100644
index d24b2ed..0000000
--- a/src/login/sd-login.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/inotify.h>
-#include <sys/poll.h>
-
-#include "util.h"
-#include "cgroup-util.h"
-#include "macro.h"
-#include "strv.h"
-#include "fileio.h"
-#include "login-shared.h"
-#include "sd-login.h"
-
-_public_ int sd_pid_get_session(pid_t pid, char **session) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(session, -EINVAL);
-
- return cg_pid_get_session(pid, session);
-}
-
-_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(unit, -EINVAL);
-
- return cg_pid_get_unit(pid, unit);
-}
-
-_public_ int sd_pid_get_user_unit(pid_t pid, char **unit) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(unit, -EINVAL);
-
- return cg_pid_get_user_unit(pid, unit);
-}
-
-_public_ int sd_pid_get_machine_name(pid_t pid, char **name) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(name, -EINVAL);
-
- return cg_pid_get_machine_name(pid, name);
-}
-
-_public_ int sd_pid_get_slice(pid_t pid, char **slice) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(slice, -EINVAL);
-
- return cg_pid_get_slice(pid, slice);
-}
-
-_public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
-
- assert_return(pid >= 0, -EINVAL);
- assert_return(uid, -EINVAL);
-
- return cg_pid_get_owner_uid(pid, uid);
-}
-
-_public_ int sd_peer_get_session(int fd, char **session) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(session, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_session(ucred.pid, session);
-}
-
-_public_ int sd_peer_get_owner_uid(int fd, uid_t *uid) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(uid, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_owner_uid(ucred.pid, uid);
-}
-
-_public_ int sd_peer_get_unit(int fd, char **unit) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(unit, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_unit(ucred.pid, unit);
-}
-
-_public_ int sd_peer_get_user_unit(int fd, char **unit) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(unit, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_user_unit(ucred.pid, unit);
-}
-
-_public_ int sd_peer_get_machine_name(int fd, char **machine) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(machine, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_machine_name(ucred.pid, machine);
-}
-
-_public_ int sd_peer_get_slice(int fd, char **slice) {
- struct ucred ucred;
- int r;
-
- assert_return(fd >= 0, -EINVAL);
- assert_return(slice, -EINVAL);
-
- r = getpeercred(fd, &ucred);
- if (r < 0)
- return r;
-
- return cg_pid_get_slice(ucred.pid, slice);
-}
-
-_public_ int sd_uid_get_state(uid_t uid, char**state) {
- _cleanup_free_ char *p = NULL;
- char *s = NULL;
- int r;
-
- assert_return(state, -EINVAL);
-
- if (asprintf(&p, "/run/systemd/users/%lu", (unsigned long) uid) < 0)
- return -ENOMEM;
-
- r = parse_env_file(p, NEWLINE, "STATE", &s, NULL);
- if (r == -ENOENT) {
- free(s);
- s = strdup("offline");
- if (!s)
- return -ENOMEM;
-
- } else if (r < 0) {
- free(s);
- return r;
- } else if (!s)
- return -EIO;
-
- *state = s;
- return 0;
-}
-
-_public_ int sd_uid_is_on_seat(uid_t uid, int require_active, const char *seat) {
- char *w, *state;
- _cleanup_free_ char *t = NULL, *s = NULL, *p = NULL;
- size_t l;
- int r;
- const char *variable;
-
- assert_return(seat, -EINVAL);
-
- variable = require_active ? "ACTIVE_UID" : "UIDS";
-
- p = strappend("/run/systemd/seats/", seat);
- if (!p)
- return -ENOMEM;
-
- r = parse_env_file(p, NEWLINE, variable, &s, NULL);
-
- if (r < 0)
- return r;
-
- if (!s)
- return -EIO;
-
- if (asprintf(&t, "%lu", (unsigned long) uid) < 0)
- return -ENOMEM;
-
- FOREACH_WORD(w, l, s, state) {
- if (strneq(t, w, l))
- return 1;
- }
-
- return 0;
-}
-
-static int uid_get_array(uid_t uid, const char *variable, char ***array) {
- _cleanup_free_ char *p = NULL, *s = NULL;
- char **a;
- int r;
-
- if (asprintf(&p, "/run/systemd/users/%lu", (unsigned long) uid) < 0)
- return -ENOMEM;
-
- r = parse_env_file(p, NEWLINE,
- variable, &s,
- NULL);
- if (r < 0) {
- if (r == -ENOENT) {
- if (array)
- *array = NULL;
- return 0;
- }
-
- return r;
- }
-
- if (!s) {
- if (array)
- *array = NULL;
- return 0;
- }
-
- a = strv_split(s, " ");
-
- if (!a)
- return -ENOMEM;
-
- strv_uniq(a);
- r = strv_length(a);
-
- if (array)
- *array = a;
- else
- strv_free(a);
-
- return r;
-}
-
-_public_ int sd_uid_get_sessions(uid_t uid, int require_active, char ***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 == 0 ? "ONLINE_SEATS" :
- require_active > 0 ? "ACTIVE_SEATS" :
- "SEATS",
- seats);
-}
-
-static int file_of_session(const char *session, char **_p) {
- char *p;
- int r;
-
- assert(_p);
-
- if (session) {
- if (!session_id_valid(session))
- return -EINVAL;
-
- p = strappend("/run/systemd/sessions/", session);
- } else {
- _cleanup_free_ char *buf = NULL;
-
- r = sd_pid_get_session(0, &buf);
- if (r < 0)
- return r;
-
- p = strappend("/run/systemd/sessions/", buf);
- }
-
- if (!p)
- return -ENOMEM;
-
- *_p = p;
- return 0;
-}
-
-_public_ int sd_session_is_active(const char *session) {
- int r;
- _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);
- if (r < 0)
- return r;
-
- if (!s)
- return -EIO;
-
- return parse_boolean(s);
-}
-
-_public_ int sd_session_is_remote(const char *session) {
- int r;
- _cleanup_free_ char *p = NULL, *s = NULL;
-
- r = file_of_session(session, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE, "REMOTE", &s, NULL);
- if (r < 0)
- return r;
-
- if (!s)
- return -EIO;
-
- return parse_boolean(s);
-}
-
-_public_ int sd_session_get_state(const char *session, char **state) {
- _cleanup_free_ char *p = NULL, *s = NULL;
- int r;
-
- assert_return(state, -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;
- _cleanup_free_ char *p = NULL, *s = NULL;
-
- assert_return(uid, -EINVAL);
-
- r = file_of_session(session, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
- if (r < 0)
- return r;
-
- if (!s)
- return -EIO;
-
- return parse_uid(s, uid);
-}
-
-static int session_get_string(const char *session, const char *field, char **value) {
- _cleanup_free_ char *p = NULL, *s = NULL;
- int r;
-
- assert_return(value, -EINVAL);
-
- r = file_of_session(session, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE, field, &s, NULL);
-
- if (r < 0)
- return r;
-
- if (isempty(s))
- return -ENOENT;
-
- *value = s;
- s = NULL;
- 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_vt(const char *session, unsigned *vtnr) {
- _cleanup_free_ char *vtnr_string = NULL;
- unsigned u;
- int r;
-
- r = session_get_string(session, "VTNR", &vtnr_string);
- if (r < 0)
- return r;
-
- r = safe_atou(vtnr_string, &u);
- if (r < 0)
- return r;
-
- *vtnr = u;
- return 0;
-}
-
-_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);
-}
-
-_public_ int sd_session_get_remote_user(const char *session, char **remote_user) {
- return session_get_string(session, "REMOTE_USER", remote_user);
-}
-
-_public_ int sd_session_get_remote_host(const char *session, char **remote_host) {
- return session_get_string(session, "REMOTE_HOST", remote_host);
-}
-
-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 {
- _cleanup_free_ char *buf = NULL;
-
- r = sd_session_get_seat(NULL, &buf);
- if (r < 0)
- return r;
-
- p = strappend("/run/systemd/seats/", 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) {
- _cleanup_free_ char *p = NULL, *s = NULL, *t = NULL;
- int r;
-
- assert_return(session || uid, -EINVAL);
-
- r = file_of_seat(seat, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE,
- "ACTIVE", &s,
- "ACTIVE_UID", &t,
- NULL);
- if (r < 0)
- return r;
-
- if (session && !s)
- return -ENOENT;
-
- if (uid && !t)
- return -ENOENT;
-
- if (uid && t) {
- r = parse_uid(t, uid);
- if (r < 0)
- return r;
- }
-
- if (session && s) {
- *session = s;
- s = NULL;
- }
-
- return 0;
-}
-
-_public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **uids, unsigned *n_uids) {
- _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;
-
- r = file_of_seat(seat, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE,
- "SESSIONS", &s,
- "ACTIVE_SESSIONS", &t,
- NULL);
-
- if (r < 0)
- return r;
-
- if (s) {
- a = strv_split(s, " ");
- if (!a)
- return -ENOMEM;
- }
-
- if (uids && t) {
- char *w, *state;
- size_t l;
-
- FOREACH_WORD(w, l, t, state)
- n++;
-
- if (n > 0) {
- unsigned i = 0;
-
- b = new(uid_t, n);
- if (!b)
- return -ENOMEM;
-
- FOREACH_WORD(w, l, t, state) {
- _cleanup_free_ char *k = NULL;
-
- k = strndup(w, l);
- if (!k)
- return -ENOMEM;
-
- r = parse_uid(k, b + i);
-
- if (r < 0)
- continue;
-
- i++;
- }
- }
- }
-
- r = strv_length(a);
-
- if (sessions) {
- *sessions = a;
- a = NULL;
- }
-
- if (uids) {
- *uids = b;
- b = NULL;
- }
-
- if (n_uids)
- *n_uids = n;
-
- return r;
-}
-
-static int seat_get_can(const char *seat, const char *variable) {
- _cleanup_free_ char *p = NULL, *s = NULL;
- int r;
-
- assert_return(variable, -EINVAL);
-
- r = file_of_seat(seat, &p);
- if (r < 0)
- return r;
-
- r = parse_env_file(p, NEWLINE,
- variable, &s,
- NULL);
- if (r < 0)
- return r;
- if (!s)
- return 0;
-
- return parse_boolean(s);
-}
-
-_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);
-}
-
-_public_ int sd_get_sessions(char ***sessions) {
- return get_files_in_directory("/run/systemd/sessions/", sessions);
-}
-
-_public_ int sd_get_uids(uid_t **users) {
- _cleanup_closedir_ DIR *d;
- int r = 0;
- unsigned n = 0;
- _cleanup_free_ uid_t *l = NULL;
-
- d = opendir("/run/systemd/users/");
- if (!d)
- return -errno;
-
- for (;;) {
- struct dirent *de;
- int k;
- uid_t uid;
-
- errno = 0;
- de = readdir(d);
- if (!de && errno != 0)
- return -errno;
-
- if (!de)
- break;
-
- dirent_ensure_type(d, de);
-
- if (!dirent_is_file(de))
- continue;
-
- k = parse_uid(de->d_name, &uid);
- if (k < 0)
- continue;
-
- if (users) {
- if ((unsigned) r >= n) {
- uid_t *t;
-
- n = MAX(16, 2*r);
- t = realloc(l, sizeof(uid_t) * n);
- if (!t)
- return -ENOMEM;
-
- l = t;
- }
-
- assert((unsigned) r < n);
- l[r++] = uid;
- } else
- r++;
- }
-
- if (users) {
- *users = l;
- l = NULL;
- }
-
- return r;
-}
-
-_public_ int sd_get_machine_names(char ***machines) {
- char **l = NULL, **a, **b;
- int r;
-
- assert_return(machines, -EINVAL);
-
- r = get_files_in_directory("/run/systemd/machines/", &l);
- if (r < 0)
- return r;
-
- if (l) {
- r = 0;
-
- /* Filter out the unit: symlinks */
- for (a = l, b = l; *a; a++) {
- if (startswith(*a, "unit:"))
- free(*a);
- else {
- *b = *a;
- b++;
- r++;
- }
- }
-
- *b = NULL;
- }
-
- *machines = l;
- return r;
-}
-
-_public_ int sd_machine_get_class(const char *machine, char **class) {
- _cleanup_free_ char *c = NULL;
- const char *p;
- int r;
-
- assert_return(filename_is_safe(machine), -EINVAL);
- assert_return(class, -EINVAL);
-
- p = strappenda("/run/systemd/machines/", machine);
- r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL);
- if (r < 0)
- return r;
- if (!c)
- return -EIO;
-
- *class = c;
- c = NULL;
-
- return 0;
-}
-
-static inline int MONITOR_TO_FD(sd_login_monitor *m) {
- return (int) (unsigned long) m - 1;
-}
-
-static inline sd_login_monitor* FD_TO_MONITOR(int fd) {
- return (sd_login_monitor*) (unsigned long) (fd + 1);
-}
-
-_public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
- int fd, k;
- bool good = false;
-
- assert_return(m, -EINVAL);
-
- fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
- if (fd < 0)
- return -errno;
-
- if (!category || streq(category, "seat")) {
- k = inotify_add_watch(fd, "/run/systemd/seats/", IN_MOVED_TO|IN_DELETE);
- if (k < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
-
- good = true;
- }
-
- if (!category || streq(category, "session")) {
- k = inotify_add_watch(fd, "/run/systemd/sessions/", IN_MOVED_TO|IN_DELETE);
- if (k < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
-
- good = true;
- }
-
- if (!category || streq(category, "uid")) {
- k = inotify_add_watch(fd, "/run/systemd/users/", IN_MOVED_TO|IN_DELETE);
- if (k < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
-
- good = true;
- }
-
- if (!category || streq(category, "machine")) {
- k = inotify_add_watch(fd, "/run/systemd/machines/", IN_MOVED_TO|IN_DELETE);
- if (k < 0) {
- close_nointr_nofail(fd);
- return -errno;
- }
-
- good = true;
- }
-
- if (!good) {
- close_nointr(fd);
- return -EINVAL;
- }
-
- *m = FD_TO_MONITOR(fd);
- return 0;
-}
-
-_public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) {
- int fd;
-
- assert_return(m, NULL);
-
- fd = MONITOR_TO_FD(m);
- close_nointr(fd);
-
- return NULL;
-}
-
-_public_ int sd_login_monitor_flush(sd_login_monitor *m) {
-
- assert_return(m, -EINVAL);
-
- return flush_fd(MONITOR_TO_FD(m));
-}
-
-_public_ int sd_login_monitor_get_fd(sd_login_monitor *m) {
-
- assert_return(m, -EINVAL);
-
- return MONITOR_TO_FD(m);
-}
-
-_public_ int sd_login_monitor_get_events(sd_login_monitor *m) {
-
- assert_return(m, -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) {
-
- assert_return(m, -EINVAL);
- assert_return(timeout_usec, -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;
-}
diff --git a/src/login/test-login.c b/src/login/test-login.c
deleted file mode 100644
index 2ab083b..0000000
--- a/src/login/test-login.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <sys/poll.h>
-#include <string.h>
-
-#include <systemd/sd-login.h>
-
-#include "util.h"
-#include "strv.h"
-
-static void test_login(void) {
- _cleanup_close_pipe_ int pair[2] = { -1, -1 };
- _cleanup_free_ char *pp = NULL, *qq = NULL;
- int r, k;
- uid_t u, u2;
- char *seat, *type, *class, *display, *remote_user, *remote_host;
- char *session;
- char *state;
- char *session2;
- char *t;
- char **seats, **sessions, **machines;
- uid_t *uids;
- unsigned n;
- struct pollfd pollfd;
- sd_login_monitor *m = NULL;
-
- assert_se(sd_pid_get_session(0, &session) == 0);
- printf("session = %s\n", session);
-
- assert_se(sd_pid_get_owner_uid(0, &u2) == 0);
- printf("user = %lu\n", (unsigned long) u2);
-
- assert_se(socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == 0);
- sd_peer_get_session(pair[0], &pp);
- sd_peer_get_session(pair[1], &qq);
- assert_se(streq_ptr(pp, qq));
-
- r = sd_uid_get_sessions(u2, false, &sessions);
- assert_se(r >= 0);
- assert_se(r == (int) strv_length(sessions));
- assert_se(t = strv_join(sessions, ", "));
- strv_free(sessions);
- printf("sessions = %s\n", t);
- free(t);
-
- assert_se(r == sd_uid_get_sessions(u2, false, NULL));
-
- r = sd_uid_get_seats(u2, false, &seats);
- assert_se(r >= 0);
- assert_se(r == (int) strv_length(seats));
- assert_se(t = strv_join(seats, ", "));
- strv_free(seats);
- printf("seats = %s\n", t);
- free(t);
-
- assert_se(r == sd_uid_get_seats(u2, false, NULL));
-
- r = sd_session_is_active(session);
- assert_se(r >= 0);
- printf("active = %s\n", yes_no(r));
-
- r = sd_session_is_remote(session);
- assert_se(r >= 0);
- printf("remote = %s\n", yes_no(r));
-
- r = sd_session_get_state(session, &state);
- assert_se(r >= 0);
- printf("state = %s\n", state);
- free(state);
-
- assert_se(sd_session_get_uid(session, &u) >= 0);
- printf("uid = %lu\n", (unsigned long) u);
- assert_se(u == u2);
-
- assert_se(sd_session_get_type(session, &type) >= 0);
- printf("type = %s\n", type);
- free(type);
-
- assert_se(sd_session_get_class(session, &class) >= 0);
- printf("class = %s\n", class);
- free(class);
-
- assert_se(sd_session_get_display(session, &display) >= 0);
- printf("display = %s\n", display);
- free(display);
-
- assert_se(sd_session_get_remote_user(session, &remote_user) >= 0);
- printf("remote_user = %s\n", remote_user);
- free(remote_user);
-
- assert_se(sd_session_get_remote_host(session, &remote_host) >= 0);
- printf("remote_host = %s\n", remote_host);
- free(remote_host);
-
- assert_se(sd_session_get_seat(session, &seat) >= 0);
- printf("seat = %s\n", seat);
-
- r = sd_seat_can_multi_session(seat);
- assert_se(r >= 0);
- printf("can do multi session = %s\n", yes_no(r));
-
- r = sd_seat_can_tty(seat);
- assert_se(r >= 0);
- printf("can do tty = %s\n", yes_no(r));
-
- r = sd_seat_can_graphical(seat);
- assert_se(r >= 0);
- printf("can do graphical = %s\n", yes_no(r));
-
- assert_se(sd_uid_get_state(u, &state) >= 0);
- printf("state = %s\n", state);
-
- assert_se(sd_uid_is_on_seat(u, 0, seat) > 0);
-
- k = sd_uid_is_on_seat(u, 1, seat);
- assert_se(k >= 0);
- assert_se(!!r == !!r);
-
- assert_se(sd_seat_get_active(seat, &session2, &u2) >= 0);
- printf("session2 = %s\n", session2);
- printf("uid2 = %lu\n", (unsigned long) u2);
-
- r = sd_seat_get_sessions(seat, &sessions, &uids, &n);
- assert_se(r >= 0);
- printf("n_sessions = %i\n", r);
- assert_se(r == (int) strv_length(sessions));
- assert_se(t = strv_join(sessions, ", "));
- strv_free(sessions);
- printf("sessions = %s\n", t);
- free(t);
- printf("uids =");
- for (k = 0; k < (int) n; k++)
- printf(" %lu", (unsigned long) uids[k]);
- printf("\n");
- free(uids);
-
- assert_se(sd_seat_get_sessions(seat, NULL, NULL, NULL) == r);
-
- free(session);
- free(state);
- free(session2);
- free(seat);
-
- r = sd_get_seats(&seats);
- assert_se(r >= 0);
- assert_se(r == (int) strv_length(seats));
- assert_se(t = strv_join(seats, ", "));
- strv_free(seats);
- printf("n_seats = %i\n", r);
- printf("seats = %s\n", t);
- free(t);
-
- assert_se(sd_get_seats(NULL) == r);
-
- r = sd_seat_get_active(NULL, &t, NULL);
- assert_se(r >= 0);
- printf("active session on current seat = %s\n", t);
- free(t);
-
- r = sd_get_sessions(&sessions);
- assert_se(r >= 0);
- assert_se(r == (int) strv_length(sessions));
- assert_se(t = strv_join(sessions, ", "));
- strv_free(sessions);
- printf("n_sessions = %i\n", r);
- printf("sessions = %s\n", t);
- free(t);
-
- assert_se(sd_get_sessions(NULL) == r);
-
- r = sd_get_uids(&uids);
- assert_se(r >= 0);
-
- printf("uids =");
- for (k = 0; k < r; k++)
- printf(" %lu", (unsigned long) uids[k]);
- printf("\n");
- free(uids);
-
- printf("n_uids = %i\n", r);
- assert_se(sd_get_uids(NULL) == r);
-
- r = sd_get_machine_names(&machines);
- assert_se(r >= 0);
- assert_se(r == (int) strv_length(machines));
- assert_se(t = strv_join(machines, ", "));
- strv_free(machines);
- printf("n_machines = %i\n", r);
- printf("machines = %s\n", t);
- free(t);
-
- r = sd_login_monitor_new("session", &m);
- assert_se(r >= 0);
-
- for (n = 0; n < 5; n++) {
- usec_t timeout, nw;
-
- zero(pollfd);
- assert_se((pollfd.fd = sd_login_monitor_get_fd(m)) >= 0);
- assert_se((pollfd.events = sd_login_monitor_get_events(m)) >= 0);
-
- assert_se(sd_login_monitor_get_timeout(m, &timeout) >= 0);
-
- nw = now(CLOCK_MONOTONIC);
-
- r = poll(&pollfd, 1,
- timeout == (uint64_t) -1 ? -1 :
- timeout > nw ? (int) ((timeout - nw) / 1000) :
- 0);
-
- assert_se(r >= 0);
-
- sd_login_monitor_flush(m);
- printf("Wake!\n");
- }
-
- sd_login_monitor_unref(m);
-}
-
-int main(int argc, char* argv[]) {
- log_parse_environment();
- log_open();
-
- test_login();
-
- return 0;
-}
diff --git a/src/shared/login-shared.c b/src/shared/login-shared.c
new file mode 100644
index 0000000..054c775
--- /dev/null
+++ b/src/shared/login-shared.c
@@ -0,0 +1,29 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Zbigniew Jędrzejewski-Szmek
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "login-shared.h"
+#include "def.h"
+
+bool session_id_valid(const char *id) {
+ assert(id);
+
+ return id[0] && id[strspn(id, LETTERS DIGITS)] == '\0';
+}
diff --git a/src/shared/login-shared.h b/src/shared/login-shared.h
new file mode 100644
index 0000000..b2787c9
--- /dev/null
+++ b/src/shared/login-shared.h
@@ -0,0 +1,24 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Zbigniew Jędrzejewski-Szmek
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdbool.h>
+
+bool session_id_valid(const char *id);
More information about the systemd-commits
mailing list