shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-19 21:57:27 +03:00
Code

Merge pull request #6064 from keszybz/lock-session

Browse Source 
Improvements to loginctl operating on current session
This commit is contained in:
Lennart Poettering 2017-06-18 11:16:53 +02:00 committed by GitHub
commit f1fccf5322
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/login/loginctl.c
View File

@ -907,6 +907,8 @@ static int show_session(int argc, char *argv[], void *userdata) {
bool properties, new_line = false; bool properties, new_line = false;
sd_bus *bus = userdata; sd_bus *bus = userdata;
int r, i; int r, i;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *path = NULL;
assert(bus); assert(bus);
assert(argv); assert(argv);
@ -916,19 +918,27 @@ static int show_session(int argc, char *argv[], void *userdata) {
pager_open(arg_no_pager, false); pager_open(arg_no_pager, false);
if (argc <= 1) { if (argc <= 1) {
/* If not argument is specified inspect the manager const char *session, *p = "/org/freedesktop/login1/session/self";
* itself */
if (properties) if (properties)
/* If no argument is specified inspect the manager itself */
return show_properties(bus, "/org/freedesktop/login1", &new_line); return show_properties(bus, "/org/freedesktop/login1", &new_line);
/* And in the pretty case, show data of the calling session */ /* And in the pretty case, show data of the calling session */
return print_session_status_info(bus, "/org/freedesktop/login1/session/self", &new_line); session = getenv("XDG_SESSION_ID");
if (session) {
r = get_session_path(bus, session, &error, &path);
if (r < 0) {
log_error("Failed to get session path: %s", bus_error_message(&error, r));
return r;
}
p = path;
}
return print_session_status_info(bus, p, &new_line);
} }
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *path = NULL;
r = get_session_path(bus, argv[i], &error, &path); r = get_session_path(bus, argv[i], &error, &path);
if (r < 0) { if (r < 0) {
log_error("Failed to get session path: %s", bus_error_message(&error, r)); log_error("Failed to get session path: %s", bus_error_message(&error, r));
@ -1074,12 +1084,11 @@ static int activate(int argc, char *argv[], void *userdata) {
polkit_agent_open_if_enabled(); polkit_agent_open_if_enabled();
if (argc < 2) { if (argc < 2) {
/* No argument? Let's convert this into the empty /* No argument? Let's either use $XDG_SESSION_ID (if specified), or an empty
* session name, which the calls will then resolve to * session name, in which case logind will try to guess our session. */
* the caller's session. */
short_argv[0] = argv[0]; short_argv[0] = argv[0];
short_argv[1] = (char*) ""; short_argv[1] = getenv("XDG_SESSION_ID") ?: (char*) "";
short_argv[2] = NULL; short_argv[2] = NULL;
argv = short_argv; argv = short_argv;
@ -1155,8 +1164,11 @@ static int enable_linger(int argc, char *argv[], void *userdata) {
b = streq(argv[0], "enable-linger"); b = streq(argv[0], "enable-linger");
if (argc < 2) { 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[0] = argv[0];
short_argv[1] = (char*) ""; short_argv[1] = getenv("XDG_SESSION_ID") ?: (char*) "";
short_argv[2] = NULL; short_argv[2] = NULL;
argv = short_argv; argv = short_argv;
argc = 2; argc = 2;

3
src/login/logind-dbus.c
View File

@ -65,6 +65,9 @@ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const ch
return r; return r;
r = sd_bus_creds_get_session(creds, &name); r = sd_bus_creds_get_session(creds, &name);
if (r == -ENXIO)
return sd_bus_error_setf(error, BUS_ERROR_NO_SESSION_FOR_PID,
"Caller does not belong to any known session");
if (r < 0) if (r < 0)
return r; return r;
} }