#include "bus-error.h"
#include "conf-parser.h"
#include "clean-ipc.h"
+#include "logind-user.h"
#include "smack-util.h"
#include "formats-util.h"
-#include "label.h"
-#include "logind-user.h"
User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) {
User *u;
free(u);
}
-static int user_save_internal(User *u) {
+int user_save(User *u) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(u);
assert(u->state_file);
+ if (!u->started)
+ return 0;
+
r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0);
if (r < 0)
- goto finish;
+ goto fail;
r = fopen_temporary(u->state_file, &f, &temp_path);
if (r < 0)
- goto finish;
+ goto fail;
fchmod(fileno(f), 0644);
fputc('\n', f);
}
- fflush(f);
+ r = fflush_and_check(f);
+ if (r < 0)
+ goto fail;
- if (ferror(f) || rename(temp_path, u->state_file) < 0) {
+ if (rename(temp_path, u->state_file) < 0) {
r = -errno;
- unlink(u->state_file);
- unlink(temp_path);
+ goto fail;
}
-finish:
- if (r < 0)
- log_error_errno(r, "Failed to save user data %s: %m", u->state_file);
-
- return r;
-}
+ return 0;
-int user_save(User *u) {
- assert(u);
+fail:
+ (void) unlink(u->state_file);
- if (!u->started)
- return 0;
+ if (temp_path)
+ (void) unlink(temp_path);
- return user_save_internal (u);
+ return log_error_errno(r, "Failed to save user data %s: %m", u->state_file);
}
int user_load(User *u) {
} else
p = u->runtime_path;
- if (path_is_mount_point(p, 0) <= 0) {
+ if (path_is_mount_point(p, false) <= 0) {
_cleanup_free_ char *t = NULL;
- (void) mkdir_label(p, 0700);
+ (void) mkdir(p, 0700);
if (mac_smack_use())
r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size);
goto fail;
}
}
-
- r = label_fix(p, false, false);
- if (r < 0)
- log_warning_errno(r, "Failed to fix label of '%s', ignoring: %m", p);
}
u->runtime_path = p;
if (r < 0)
return r;
-#if 0
/* Create cgroup */
r = user_start_slice(u);
if (r < 0)
return r;
- /* Save the user data so far, because pam_systemd will read the
- * XDG_RUNTIME_DIR out of it while starting up systemd --user.
- * We need to do user_save_internal() because we have not
- * "officially" started yet. */
- user_save_internal(u);
-
/* Spawn user systemd */
r = user_start_service(u);
if (r < 0)
return r;
-#endif
if (!dual_timestamp_is_set(&u->timestamp))
dual_timestamp_get(&u->timestamp);
int user_get_idle_hint(User *u, dual_timestamp *t) {
Session *s;
bool idle_hint = true;
- dual_timestamp ts = DUAL_TIMESTAMP_NULL;
+ dual_timestamp ts = { 0, 0 };
assert(u);
if (u->stopping)
return USER_CLOSING;
- if (!u->started || u->slice_job || u->service_job)
+ if (u->slice_job || u->service_job)
return USER_OPENING;
if (u->sessions) {
return manager_kill_unit(u->manager, u->slice, KILL_ALL, signo, NULL);
}
-static bool elect_display_filter(Session *s) {
- /* Return true if the session is a candidate for the user’s ‘primary
- * session’ or ‘display’. */
- assert(s);
-
- return (s->class == SESSION_USER && !s->stopping);
-}
-
-static int elect_display_compare(Session *s1, Session *s2) {
- /* Indexed by SessionType. Lower numbers mean more preferred. */
- const int type_ranks[_SESSION_TYPE_MAX] = {
- [SESSION_UNSPECIFIED] = 0,
- [SESSION_TTY] = -2,
- [SESSION_X11] = -3,
- [SESSION_WAYLAND] = -3,
- [SESSION_MIR] = -3,
- [SESSION_WEB] = -1,
- };
-
- /* Calculate the partial order relationship between s1 and s2,
- * returning < 0 if s1 is preferred as the user’s ‘primary session’,
- * 0 if s1 and s2 are equally preferred or incomparable, or > 0 if s2
- * is preferred.
- *
- * s1 or s2 may be NULL. */
- if (!s1 && !s2)
- return 0;
-
- if ((s1 == NULL) != (s2 == NULL))
- return (s1 == NULL) - (s2 == NULL);
-
- if (s1->stopping != s2->stopping)
- return s1->stopping - s2->stopping;
-
- if ((s1->class != SESSION_USER) != (s2->class != SESSION_USER))
- return (s1->class != SESSION_USER) - (s2->class != SESSION_USER);
-
- if ((s1->type == _SESSION_TYPE_INVALID) != (s2->type == _SESSION_TYPE_INVALID))
- return (s1->type == _SESSION_TYPE_INVALID) - (s2->type == _SESSION_TYPE_INVALID);
-
- if (s1->type != s2->type)
- return type_ranks[s1->type] - type_ranks[s2->type];
-
- return 0;
-}
-
void user_elect_display(User *u) {
- Session *s;
+ Session *graphical = NULL, *text = NULL, *other = NULL, *s;
assert(u);
/* This elects a primary session for each user, which we call
* the "display". We try to keep the assignment stable, but we
* "upgrade" to better choices. */
- log_debug("Electing new display for user %s", u->name);
LIST_FOREACH(sessions_by_user, s, u->sessions) {
- if (!elect_display_filter(s)) {
- log_debug("Ignoring session %s", s->id);
+
+ if (s->class != SESSION_USER)
continue;
- }
- if (elect_display_compare(s, u->display) < 0) {
- log_debug("Choosing session %s in preference to %s", s->id, u->display ? u->display->id : "-");
- u->display = s;
- }
+ if (s->stopping)
+ continue;
+
+ if (SESSION_TYPE_IS_GRAPHICAL(s->type))
+ graphical = s;
+ else if (s->type == SESSION_TTY)
+ text = s;
+ else
+ other = s;
+ }
+
+ if (graphical &&
+ (!u->display ||
+ u->display->class != SESSION_USER ||
+ u->display->stopping ||
+ !SESSION_TYPE_IS_GRAPHICAL(u->display->type))) {
+ u->display = graphical;
+ return;
+ }
+
+ if (text &&
+ (!u->display ||
+ u->display->class != SESSION_USER ||
+ u->display->stopping ||
+ u->display->type != SESSION_TTY)) {
+ u->display = text;
+ return;
}
+
+ if (other &&
+ (!u->display ||
+ u->display->class != SESSION_USER ||
+ u->display->stopping))
+ u->display = other;
}
static const char* const user_state_table[_USER_STATE_MAX] = {
~ianmdlvl / elogind.git / blobdiff