Move part of logind.c into a separate file
liblogind-core.la was underlinked, missing a few functions defined in logind.c. They are moved to a new file, logind-core.c, and this file is linked into liblogind-core.la. In addition, logind-acl.c is attached to the liblogind-core.la, instead of systemd-logind directly.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
parent
bd16acf35e
commit
2b3ab29de4
17
Makefile.am
17
Makefile.am
|
|
@ -3761,15 +3761,8 @@ systemd_logind_LDADD = \
|
|||
libsystemd-logind-core.la \
|
||||
$(libsystemd_logind_core_la_LIBADD)
|
||||
|
||||
if HAVE_ACL
|
||||
systemd_logind_SOURCES += \
|
||||
src/login/logind-acl.c
|
||||
|
||||
systemd_logind_LDADD += \
|
||||
libsystemd-acl.la
|
||||
endif
|
||||
|
||||
libsystemd_logind_core_la_SOURCES = \
|
||||
src/login/logind-core.c \
|
||||
src/login/logind-dbus.c \
|
||||
src/login/logind-device.c \
|
||||
src/login/logind-device.h \
|
||||
|
|
@ -3807,6 +3800,14 @@ libsystemd_logind_core_la_LIBADD = \
|
|||
libsystemd-id128-internal.la \
|
||||
libudev.la
|
||||
|
||||
if HAVE_ACL
|
||||
libsystemd_logind_core_la_SOURCES += \
|
||||
src/login/logind-acl.c
|
||||
|
||||
libsystemd_logind_core_la_LIBADD += \
|
||||
libsystemd-acl.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES += \
|
||||
libsystemd-logind-core.la
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,514 @@
|
|||
/*-*- 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/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <linux/vt.h>
|
||||
|
||||
#include "logind.h"
|
||||
#include "dbus-common.h"
|
||||
#include "strv.h"
|
||||
|
||||
int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
|
||||
Device *d;
|
||||
|
||||
assert(m);
|
||||
assert(sysfs);
|
||||
|
||||
d = hashmap_get(m->devices, sysfs);
|
||||
if (d) {
|
||||
if (_device)
|
||||
*_device = d;
|
||||
|
||||
/* we support adding master-flags, but not removing them */
|
||||
d->master = d->master || master;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
d = device_new(m, sysfs, master);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_device)
|
||||
*_device = d;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_seat(Manager *m, const char *id, Seat **_seat) {
|
||||
Seat *s;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
s = hashmap_get(m->seats, id);
|
||||
if (s) {
|
||||
if (_seat)
|
||||
*_seat = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s = seat_new(m, id);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_seat)
|
||||
*_seat = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_session(Manager *m, const char *id, Session **_session) {
|
||||
Session *s;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
s = hashmap_get(m->sessions, id);
|
||||
if (s) {
|
||||
if (_session)
|
||||
*_session = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s = session_new(m, id);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_session)
|
||||
*_session = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) {
|
||||
User *u;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid));
|
||||
if (u) {
|
||||
if (_user)
|
||||
*_user = u;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u = user_new(m, uid, gid, name);
|
||||
if (!u)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_user)
|
||||
*_user = u;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_user_by_name(Manager *m, const char *name, User **_user) {
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
r = get_user_creds(&name, &uid, &gid, NULL, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return manager_add_user(m, uid, gid, name, _user);
|
||||
}
|
||||
|
||||
int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user) {
|
||||
struct passwd *p;
|
||||
|
||||
assert(m);
|
||||
|
||||
errno = 0;
|
||||
p = getpwuid(uid);
|
||||
if (!p)
|
||||
return errno ? -errno : -ENOENT;
|
||||
|
||||
return manager_add_user(m, uid, p->pw_gid, p->pw_name, _user);
|
||||
}
|
||||
|
||||
int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor) {
|
||||
Inhibitor *i;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
i = hashmap_get(m->inhibitors, id);
|
||||
if (i) {
|
||||
if (_inhibitor)
|
||||
*_inhibitor = i;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
i = inhibitor_new(m, id);
|
||||
if (!i)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_inhibitor)
|
||||
*_inhibitor = i;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_button(Manager *m, const char *name, Button **_button) {
|
||||
Button *b;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
b = hashmap_get(m->buttons, name);
|
||||
if (b) {
|
||||
if (_button)
|
||||
*_button = b;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
b = button_new(m, name);
|
||||
if (!b)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_button)
|
||||
*_button = b;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_watch_busname(Manager *m, const char *name) {
|
||||
char *n;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
if (hashmap_get(m->busnames, name))
|
||||
return 0;
|
||||
|
||||
n = strdup(name);
|
||||
if (!n)
|
||||
return -ENOMEM;
|
||||
|
||||
r = hashmap_put(m->busnames, n, n);
|
||||
if (r < 0) {
|
||||
free(n);
|
||||
return r;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void manager_drop_busname(Manager *m, const char *name) {
|
||||
Session *session;
|
||||
Iterator i;
|
||||
char *key;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
if (!hashmap_get(m->busnames, name))
|
||||
return;
|
||||
|
||||
/* keep it if the name still owns a controller */
|
||||
HASHMAP_FOREACH(session, m->sessions, i)
|
||||
if (session_is_controller(session, name))
|
||||
return;
|
||||
|
||||
key = hashmap_remove(m->busnames, name);
|
||||
if (key)
|
||||
free(key);
|
||||
}
|
||||
|
||||
int manager_process_seat_device(Manager *m, struct udev_device *d) {
|
||||
Device *device;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
if (streq_ptr(udev_device_get_action(d), "remove")) {
|
||||
|
||||
device = hashmap_get(m->devices, udev_device_get_syspath(d));
|
||||
if (!device)
|
||||
return 0;
|
||||
|
||||
seat_add_to_gc_queue(device->seat);
|
||||
device_free(device);
|
||||
|
||||
} else {
|
||||
const char *sn;
|
||||
Seat *seat = NULL;
|
||||
bool master;
|
||||
|
||||
sn = udev_device_get_property_value(d, "ID_SEAT");
|
||||
if (isempty(sn))
|
||||
sn = "seat0";
|
||||
|
||||
if (!seat_name_is_valid(sn)) {
|
||||
log_warning("Device with invalid seat name %s found, ignoring.", sn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ignore non-master devices for unknown seats */
|
||||
master = udev_device_has_tag(d, "master-of-seat");
|
||||
if (!master && !(seat = hashmap_get(m->seats, sn)))
|
||||
return 0;
|
||||
|
||||
r = manager_add_device(m, udev_device_get_syspath(d), master, &device);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!seat) {
|
||||
r = manager_add_seat(m, sn, &seat);
|
||||
if (r < 0) {
|
||||
if (!device->seat)
|
||||
device_free(device);
|
||||
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
device_attach(device, seat);
|
||||
seat_start(seat);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_process_button_device(Manager *m, struct udev_device *d) {
|
||||
Button *b;
|
||||
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
if (streq_ptr(udev_device_get_action(d), "remove")) {
|
||||
|
||||
b = hashmap_get(m->buttons, udev_device_get_sysname(d));
|
||||
if (!b)
|
||||
return 0;
|
||||
|
||||
button_free(b);
|
||||
|
||||
} else {
|
||||
const char *sn;
|
||||
|
||||
r = manager_add_button(m, udev_device_get_sysname(d), &b);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
sn = udev_device_get_property_value(d, "ID_SEAT");
|
||||
if (isempty(sn))
|
||||
sn = "seat0";
|
||||
|
||||
button_set_seat(b, sn);
|
||||
button_open(b);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
|
||||
_cleanup_free_ char *unit = NULL;
|
||||
Session *s;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(session);
|
||||
|
||||
if (pid < 1)
|
||||
return -EINVAL;
|
||||
|
||||
r = cg_pid_get_unit(pid, &unit);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
s = hashmap_get(m->session_units, unit);
|
||||
if (!s)
|
||||
return 0;
|
||||
|
||||
*session = s;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int manager_get_user_by_pid(Manager *m, pid_t pid, User **user) {
|
||||
_cleanup_free_ char *unit = NULL;
|
||||
User *u;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(user);
|
||||
|
||||
if (pid < 1)
|
||||
return -EINVAL;
|
||||
|
||||
r = cg_pid_get_slice(pid, &unit);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
u = hashmap_get(m->user_units, unit);
|
||||
if (!u)
|
||||
return 0;
|
||||
|
||||
*user = u;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int manager_get_idle_hint(Manager *m, dual_timestamp *t) {
|
||||
Session *s;
|
||||
bool idle_hint;
|
||||
dual_timestamp ts = { 0, 0 };
|
||||
Iterator i;
|
||||
|
||||
assert(m);
|
||||
|
||||
idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false, false, 0);
|
||||
|
||||
HASHMAP_FOREACH(s, m->sessions, i) {
|
||||
dual_timestamp k;
|
||||
int ih;
|
||||
|
||||
ih = session_get_idle_hint(s, &k);
|
||||
if (ih < 0)
|
||||
return ih;
|
||||
|
||||
if (!ih) {
|
||||
if (!idle_hint) {
|
||||
if (k.monotonic < ts.monotonic)
|
||||
ts = k;
|
||||
} else {
|
||||
idle_hint = false;
|
||||
ts = k;
|
||||
}
|
||||
} else if (idle_hint) {
|
||||
|
||||
if (k.monotonic > ts.monotonic)
|
||||
ts = k;
|
||||
}
|
||||
}
|
||||
|
||||
if (t)
|
||||
*t = ts;
|
||||
|
||||
return idle_hint;
|
||||
}
|
||||
|
||||
bool manager_shall_kill(Manager *m, const char *user) {
|
||||
assert(m);
|
||||
assert(user);
|
||||
|
||||
if (!m->kill_user_processes)
|
||||
return false;
|
||||
|
||||
if (strv_contains(m->kill_exclude_users, user))
|
||||
return false;
|
||||
|
||||
if (strv_isempty(m->kill_only_users))
|
||||
return true;
|
||||
|
||||
return strv_contains(m->kill_only_users, user);
|
||||
}
|
||||
|
||||
static int vt_is_busy(int vtnr) {
|
||||
struct vt_stat vt_stat;
|
||||
int r = 0, fd;
|
||||
|
||||
assert(vtnr >= 1);
|
||||
|
||||
/* We explicitly open /dev/tty1 here instead of /dev/tty0. If
|
||||
* we'd open the latter we'd open the foreground tty which
|
||||
* hence would be unconditionally busy. By opening /dev/tty1
|
||||
* we avoid this. Since tty1 is special and needs to be an
|
||||
* explicitly loaded getty or DM this is safe. */
|
||||
|
||||
fd = open_terminal("/dev/tty1", O_RDWR|O_NOCTTY|O_CLOEXEC);
|
||||
if (fd < 0)
|
||||
return -errno;
|
||||
|
||||
if (ioctl(fd, VT_GETSTATE, &vt_stat) < 0)
|
||||
r = -errno;
|
||||
else
|
||||
r = !!(vt_stat.v_state & (1 << vtnr));
|
||||
|
||||
close_nointr_nofail(fd);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int manager_spawn_autovt(Manager *m, int vtnr) {
|
||||
int r;
|
||||
char *name = NULL;
|
||||
const char *mode = "fail";
|
||||
|
||||
assert(m);
|
||||
assert(vtnr >= 1);
|
||||
|
||||
if ((unsigned) vtnr > m->n_autovts &&
|
||||
(unsigned) vtnr != m->reserve_vt)
|
||||
return 0;
|
||||
|
||||
if ((unsigned) vtnr != m->reserve_vt) {
|
||||
/* If this is the reserved TTY, we'll start the getty
|
||||
* on it in any case, but otherwise only if it is not
|
||||
* busy. */
|
||||
|
||||
r = vt_is_busy(vtnr);
|
||||
if (r < 0)
|
||||
return r;
|
||||
else if (r > 0)
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) {
|
||||
log_error("Could not allocate service name.");
|
||||
r = -ENOMEM;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = bus_method_call_with_reply (
|
||||
m->bus,
|
||||
"org.freedesktop.systemd1",
|
||||
"/org/freedesktop/systemd1",
|
||||
"org.freedesktop.systemd1.Manager",
|
||||
"StartUnit",
|
||||
NULL,
|
||||
NULL,
|
||||
DBUS_TYPE_STRING, &name,
|
||||
DBUS_TYPE_STRING, &mode,
|
||||
DBUS_TYPE_INVALID);
|
||||
|
||||
finish:
|
||||
free(name);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
|
@ -20,13 +20,11 @@
|
|||
***/
|
||||
|
||||
#include <errno.h>
|
||||
#include <pwd.h>
|
||||
#include <libudev.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/epoll.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/vt.h>
|
||||
#include <sys/timerfd.h>
|
||||
|
||||
|
|
@ -192,313 +190,6 @@ void manager_free(Manager *m) {
|
|||
free(m);
|
||||
}
|
||||
|
||||
int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device) {
|
||||
Device *d;
|
||||
|
||||
assert(m);
|
||||
assert(sysfs);
|
||||
|
||||
d = hashmap_get(m->devices, sysfs);
|
||||
if (d) {
|
||||
if (_device)
|
||||
*_device = d;
|
||||
|
||||
/* we support adding master-flags, but not removing them */
|
||||
d->master = d->master || master;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
d = device_new(m, sysfs, master);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_device)
|
||||
*_device = d;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_seat(Manager *m, const char *id, Seat **_seat) {
|
||||
Seat *s;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
s = hashmap_get(m->seats, id);
|
||||
if (s) {
|
||||
if (_seat)
|
||||
*_seat = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s = seat_new(m, id);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_seat)
|
||||
*_seat = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_session(Manager *m, const char *id, Session **_session) {
|
||||
Session *s;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
s = hashmap_get(m->sessions, id);
|
||||
if (s) {
|
||||
if (_session)
|
||||
*_session = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s = session_new(m, id);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_session)
|
||||
*_session = s;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **_user) {
|
||||
User *u;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid));
|
||||
if (u) {
|
||||
if (_user)
|
||||
*_user = u;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
u = user_new(m, uid, gid, name);
|
||||
if (!u)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_user)
|
||||
*_user = u;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_user_by_name(Manager *m, const char *name, User **_user) {
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
r = get_user_creds(&name, &uid, &gid, NULL, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
return manager_add_user(m, uid, gid, name, _user);
|
||||
}
|
||||
|
||||
int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user) {
|
||||
struct passwd *p;
|
||||
|
||||
assert(m);
|
||||
|
||||
errno = 0;
|
||||
p = getpwuid(uid);
|
||||
if (!p)
|
||||
return errno ? -errno : -ENOENT;
|
||||
|
||||
return manager_add_user(m, uid, p->pw_gid, p->pw_name, _user);
|
||||
}
|
||||
|
||||
int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor) {
|
||||
Inhibitor *i;
|
||||
|
||||
assert(m);
|
||||
assert(id);
|
||||
|
||||
i = hashmap_get(m->inhibitors, id);
|
||||
if (i) {
|
||||
if (_inhibitor)
|
||||
*_inhibitor = i;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
i = inhibitor_new(m, id);
|
||||
if (!i)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_inhibitor)
|
||||
*_inhibitor = i;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_add_button(Manager *m, const char *name, Button **_button) {
|
||||
Button *b;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
b = hashmap_get(m->buttons, name);
|
||||
if (b) {
|
||||
if (_button)
|
||||
*_button = b;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
b = button_new(m, name);
|
||||
if (!b)
|
||||
return -ENOMEM;
|
||||
|
||||
if (_button)
|
||||
*_button = b;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_watch_busname(Manager *m, const char *name) {
|
||||
char *n;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
if (hashmap_get(m->busnames, name))
|
||||
return 0;
|
||||
|
||||
n = strdup(name);
|
||||
if (!n)
|
||||
return -ENOMEM;
|
||||
|
||||
r = hashmap_put(m->busnames, n, n);
|
||||
if (r < 0) {
|
||||
free(n);
|
||||
return r;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void manager_drop_busname(Manager *m, const char *name) {
|
||||
Session *session;
|
||||
Iterator i;
|
||||
char *key;
|
||||
|
||||
assert(m);
|
||||
assert(name);
|
||||
|
||||
if (!hashmap_get(m->busnames, name))
|
||||
return;
|
||||
|
||||
/* keep it if the name still owns a controller */
|
||||
HASHMAP_FOREACH(session, m->sessions, i)
|
||||
if (session_is_controller(session, name))
|
||||
return;
|
||||
|
||||
key = hashmap_remove(m->busnames, name);
|
||||
if (key)
|
||||
free(key);
|
||||
}
|
||||
|
||||
int manager_process_seat_device(Manager *m, struct udev_device *d) {
|
||||
Device *device;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
if (streq_ptr(udev_device_get_action(d), "remove")) {
|
||||
|
||||
device = hashmap_get(m->devices, udev_device_get_syspath(d));
|
||||
if (!device)
|
||||
return 0;
|
||||
|
||||
seat_add_to_gc_queue(device->seat);
|
||||
device_free(device);
|
||||
|
||||
} else {
|
||||
const char *sn;
|
||||
Seat *seat = NULL;
|
||||
bool master;
|
||||
|
||||
sn = udev_device_get_property_value(d, "ID_SEAT");
|
||||
if (isempty(sn))
|
||||
sn = "seat0";
|
||||
|
||||
if (!seat_name_is_valid(sn)) {
|
||||
log_warning("Device with invalid seat name %s found, ignoring.", sn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ignore non-master devices for unknown seats */
|
||||
master = udev_device_has_tag(d, "master-of-seat");
|
||||
if (!master && !(seat = hashmap_get(m->seats, sn)))
|
||||
return 0;
|
||||
|
||||
r = manager_add_device(m, udev_device_get_syspath(d), master, &device);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!seat) {
|
||||
r = manager_add_seat(m, sn, &seat);
|
||||
if (r < 0) {
|
||||
if (!device->seat)
|
||||
device_free(device);
|
||||
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
device_attach(device, seat);
|
||||
seat_start(seat);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_process_button_device(Manager *m, struct udev_device *d) {
|
||||
Button *b;
|
||||
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
|
||||
if (streq_ptr(udev_device_get_action(d), "remove")) {
|
||||
|
||||
b = hashmap_get(m->buttons, udev_device_get_sysname(d));
|
||||
if (!b)
|
||||
return 0;
|
||||
|
||||
button_free(b);
|
||||
|
||||
} else {
|
||||
const char *sn;
|
||||
|
||||
r = manager_add_button(m, udev_device_get_sysname(d), &b);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
sn = udev_device_get_property_value(d, "ID_SEAT");
|
||||
if (isempty(sn))
|
||||
sn = "seat0";
|
||||
|
||||
button_set_seat(b, sn);
|
||||
button_open(b);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int manager_enumerate_devices(Manager *m) {
|
||||
struct udev_list_entry *item = NULL, *first = NULL;
|
||||
struct udev_enumerate *e;
|
||||
|
|
@ -890,80 +581,6 @@ int manager_dispatch_console(Manager *m) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int vt_is_busy(int vtnr) {
|
||||
struct vt_stat vt_stat;
|
||||
int r = 0, fd;
|
||||
|
||||
assert(vtnr >= 1);
|
||||
|
||||
/* We explicitly open /dev/tty1 here instead of /dev/tty0. If
|
||||
* we'd open the latter we'd open the foreground tty which
|
||||
* hence would be unconditionally busy. By opening /dev/tty1
|
||||
* we avoid this. Since tty1 is special and needs to be an
|
||||
* explicitly loaded getty or DM this is safe. */
|
||||
|
||||
fd = open_terminal("/dev/tty1", O_RDWR|O_NOCTTY|O_CLOEXEC);
|
||||
if (fd < 0)
|
||||
return -errno;
|
||||
|
||||
if (ioctl(fd, VT_GETSTATE, &vt_stat) < 0)
|
||||
r = -errno;
|
||||
else
|
||||
r = !!(vt_stat.v_state & (1 << vtnr));
|
||||
|
||||
close_nointr_nofail(fd);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int manager_spawn_autovt(Manager *m, int vtnr) {
|
||||
int r;
|
||||
char *name = NULL;
|
||||
const char *mode = "fail";
|
||||
|
||||
assert(m);
|
||||
assert(vtnr >= 1);
|
||||
|
||||
if ((unsigned) vtnr > m->n_autovts &&
|
||||
(unsigned) vtnr != m->reserve_vt)
|
||||
return 0;
|
||||
|
||||
if ((unsigned) vtnr != m->reserve_vt) {
|
||||
/* If this is the reserved TTY, we'll start the getty
|
||||
* on it in any case, but otherwise only if it is not
|
||||
* busy. */
|
||||
|
||||
r = vt_is_busy(vtnr);
|
||||
if (r < 0)
|
||||
return r;
|
||||
else if (r > 0)
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) {
|
||||
log_error("Could not allocate service name.");
|
||||
r = -ENOMEM;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = bus_method_call_with_reply (
|
||||
m->bus,
|
||||
"org.freedesktop.systemd1",
|
||||
"/org/freedesktop/systemd1",
|
||||
"org.freedesktop.systemd1.Manager",
|
||||
"StartUnit",
|
||||
NULL,
|
||||
NULL,
|
||||
DBUS_TYPE_STRING, &name,
|
||||
DBUS_TYPE_STRING, &mode,
|
||||
DBUS_TYPE_INVALID);
|
||||
|
||||
finish:
|
||||
free(name);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static int manager_reserve_vt(Manager *m) {
|
||||
_cleanup_free_ char *p = NULL;
|
||||
|
||||
|
|
@ -987,52 +604,6 @@ static int manager_reserve_vt(Manager *m) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
|
||||
_cleanup_free_ char *unit = NULL;
|
||||
Session *s;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(session);
|
||||
|
||||
if (pid < 1)
|
||||
return -EINVAL;
|
||||
|
||||
r = cg_pid_get_unit(pid, &unit);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
s = hashmap_get(m->session_units, unit);
|
||||
if (!s)
|
||||
return 0;
|
||||
|
||||
*session = s;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int manager_get_user_by_pid(Manager *m, pid_t pid, User **user) {
|
||||
_cleanup_free_ char *unit = NULL;
|
||||
User *u;
|
||||
int r;
|
||||
|
||||
assert(m);
|
||||
assert(user);
|
||||
|
||||
if (pid < 1)
|
||||
return -EINVAL;
|
||||
|
||||
r = cg_pid_get_slice(pid, &unit);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
u = hashmap_get(m->user_units, unit);
|
||||
if (!u)
|
||||
return 0;
|
||||
|
||||
*user = u;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void manager_dispatch_other(Manager *m, int fd) {
|
||||
Session *s;
|
||||
Inhibitor *i;
|
||||
|
|
@ -1390,61 +961,6 @@ void manager_gc(Manager *m, bool drop_not_started) {
|
|||
}
|
||||
}
|
||||
|
||||
int manager_get_idle_hint(Manager *m, dual_timestamp *t) {
|
||||
Session *s;
|
||||
bool idle_hint;
|
||||
dual_timestamp ts = { 0, 0 };
|
||||
Iterator i;
|
||||
|
||||
assert(m);
|
||||
|
||||
idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false, false, 0);
|
||||
|
||||
HASHMAP_FOREACH(s, m->sessions, i) {
|
||||
dual_timestamp k;
|
||||
int ih;
|
||||
|
||||
ih = session_get_idle_hint(s, &k);
|
||||
if (ih < 0)
|
||||
return ih;
|
||||
|
||||
if (!ih) {
|
||||
if (!idle_hint) {
|
||||
if (k.monotonic < ts.monotonic)
|
||||
ts = k;
|
||||
} else {
|
||||
idle_hint = false;
|
||||
ts = k;
|
||||
}
|
||||
} else if (idle_hint) {
|
||||
|
||||
if (k.monotonic > ts.monotonic)
|
||||
ts = k;
|
||||
}
|
||||
}
|
||||
|
||||
if (t)
|
||||
*t = ts;
|
||||
|
||||
return idle_hint;
|
||||
}
|
||||
|
||||
bool manager_shall_kill(Manager *m, const char *user) {
|
||||
assert(m);
|
||||
assert(user);
|
||||
|
||||
if (!m->kill_user_processes)
|
||||
return false;
|
||||
|
||||
if (strv_contains(m->kill_exclude_users, user))
|
||||
return false;
|
||||
|
||||
if (strv_isempty(m->kill_only_users))
|
||||
return true;
|
||||
|
||||
return strv_contains(m->kill_only_users, user);
|
||||
}
|
||||
|
||||
int manager_dispatch_idle_action(Manager *m) {
|
||||
struct dual_timestamp since;
|
||||
struct itimerspec its = {};
|
||||
|
|
|
|||
Loading…
Reference in New Issue