mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libseat: Remove useless logind fallbacks

Browse source 
The logind code is based on the wlroots implementation, which in turn
contained copy-paste code from Mutter that serves no purpose here.
This commit is contained in:
Kenny Levinsen 2020-08-24 02:55:14 +02:00
parent 26aff21058
commit ab4b961492
1 changed files with 4 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

72
libseat/backend/logind.c
View file

@ -538,51 +538,6 @@ static bool add_signal_matches(struct backend_logind *backend) {
return true; return true;
} }
static bool contains_str(const char *needle, const char **haystack) {
for (int i = 0; haystack[i]; i++) {
if (strcmp(haystack[i], needle) == 0) {
return true;
}
}
return false;
}
static bool get_greeter_session(char **session_id) {
char *class = NULL;
char **user_sessions = NULL;
int user_session_count = sd_uid_get_sessions(getuid(), 1, &user_sessions);
if (user_session_count < 0) {
goto out;
}
if (user_session_count == 0) {
goto out;
}
for (int i = 0; i < user_session_count; ++i) {
int ret = sd_session_get_class(user_sessions[i], &class);
if (ret < 0) {
continue;
}
if (strcmp(class, "greeter") == 0) {
*session_id = strdup(user_sessions[i]);
goto out;
}
}
out:
free(class);
for (int i = 0; i < user_session_count; ++i) {
free(user_sessions[i]);
}
free(user_sessions);
return *session_id != NULL;
}
static bool find_session_path(struct backend_logind *session) { static bool find_session_path(struct backend_logind *session) {
int ret; int ret;
sd_bus_message *msg = NULL; sd_bus_message *msg = NULL;
@ -638,7 +593,6 @@ out:
static bool get_display_session(char **session_id) { static bool get_display_session(char **session_id) {
assert(session_id != NULL); assert(session_id != NULL);
char *xdg_session_id = getenv("XDG_SESSION_ID"); char *xdg_session_id = getenv("XDG_SESSION_ID");
char *state = NULL;
if (xdg_session_id) { if (xdg_session_id) {
// This just checks whether the supplied session ID is valid // This just checks whether the supplied session ID is valid
@ -646,48 +600,30 @@ static bool get_display_session(char **session_id) {
goto error; goto error;
} }
*session_id = strdup(xdg_session_id); *session_id = strdup(xdg_session_id);
return true; goto success;
} }
// If there's a session active for the current process then just use // If there's a session active for the current process then just use
// that // that
int ret = sd_pid_get_session(getpid(), session_id); int ret = sd_pid_get_session(getpid(), session_id);
if (ret == 0) { if (ret == 0) {
return true; goto success;
} }
// Find any active sessions for the user if the process isn't part of an // Find any active sessions for the user if the process isn't part of an
// active session itself // active session itself
ret = sd_uid_get_display(getuid(), session_id); ret = sd_uid_get_display(getuid(), session_id);
if (ret < 0 && ret != -ENODATA) {
goto error;
}
if (ret != 0 && !get_greeter_session(session_id)) {
goto error;
}
assert(*session_id != NULL);
// Check that the session is active
ret = sd_session_get_state(*session_id, &state);
if (ret < 0) { if (ret < 0) {
goto error; goto error;
} }
const char *active_states[] = {"active", "online", NULL}; success:
if (!contains_str(state, active_states)) { assert(*session_id != NULL);
goto error;
}
free(state);
return true; return true;
error: error:
free(state);
free(*session_id); free(*session_id);
*session_id = NULL; *session_id = NULL;
return false; return false;
} }