SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loginctl: drop $XDG_SESSION_ID env var magic

Browse Source 
The server side can do something similar, but better on its own, let's
hence rely on that.
This commit is contained in:
Lennart Poettering
2019-05-24 15:05:27 +02:00
parent 3b92c086a8
commit 544c4e1eda
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/login/loginctl.c
+7 -24
View File
@@ -846,23 +846,11 @@ static int show_session(int argc, char *argv[], void *userdata) {
(void) pager_open(arg_pager_flags);
if (argc <= 1) {
const char *session, *p = "/org/freedesktop/login1/session/self";
/* If no argument is specified inspect the manager itself */
if (properties)
/* If no argument is specified inspect the manager itself */
return show_properties(bus, "/org/freedesktop/login1", &new_line);
/* And in the pretty case, show data of the calling session */
session = getenv("XDG_SESSION_ID");
if (session) {
r = get_session_path(bus, session, &error, &path);
if (r < 0)
return log_error_errno(r, "Failed to get session path: %s", bus_error_message(&error, r));
p = path;
}
return print_session_status_info(bus, p, &new_line);
return print_session_status_info(bus, "/org/freedesktop/login1/session/auto", &new_line);
}
for (i = 1; i < argc; i++) {
@@ -895,8 +883,7 @@ static int show_user(int argc, char *argv[], void *userdata) {
(void) pager_open(arg_pager_flags);
if (argc <= 1) {
/* If not argument is specified inspect the manager
* itself */
/* If no argument is specified inspect the manager itself */
if (properties)
return show_properties(bus, "/org/freedesktop/login1", &new_line);
@@ -953,12 +940,11 @@ static int show_seat(int argc, char *argv[], void *userdata) {
(void) pager_open(arg_pager_flags);
if (argc <= 1) {
/* If not argument is specified inspect the manager
* itself */
/* If no argument is specified inspect the manager itself */
if (properties)
return show_properties(bus, "/org/freedesktop/login1", &new_line);
return print_seat_status_info(bus, "/org/freedesktop/login1/seat/self", &new_line);
return print_seat_status_info(bus, "/org/freedesktop/login1/seat/auto", &new_line);
}
for (i = 1; i < argc; i++) {
@@ -1005,11 +991,8 @@ static int activate(int argc, char *argv[], void *userdata) {
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
if (argc < 2) {
/* No argument? Let's either use $XDG_SESSION_ID (if specified), or an empty
* session name, in which case logind will try to guess our session. */
short_argv[0] = argv[0];
short_argv[1] = getenv("XDG_SESSION_ID") ?: (char*) "";
short_argv[1] = (char*) "";
short_argv[2] = NULL;
argv = short_argv;
@@ -1030,7 +1013,7 @@ static int activate(int argc, char *argv[], void *userdata) {
&error, NULL,
"s", argv[i]);
if (r < 0)
return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, -r));
return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, r));
}
return 0;