diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-07 21:06:44 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-07 21:06:44 +0100 |
| commit | 46e65dcc3a522b5e992e165b5e61d14254026859 (patch) | |
| tree | 84ea0d49f1c502972e8bfa85587cfbf9c875b586 /src/login | |
| parent | 0d49cfa264e8afc52526cd0cd73b2309dff498b2 (diff) | |
polkit: don't spawn local client if we access a remote system
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/loginctl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index cb05907ff1..c9899ecba5 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -53,7 +53,6 @@ static char *arg_host = NULL; static void pager_open_if_enabled(void) { - /* Cache result before we open the pager */ if (arg_no_pager) return; @@ -67,6 +66,9 @@ static void polkit_agent_open_if_enabled(void) { if (!arg_ask_password) return; + if (arg_transport != BUS_TRANSPORT_LOCAL) + return; + polkit_agent_open(); } @@ -372,9 +374,9 @@ static int print_session_status_info(sd_bus *bus, const char *path) { {} }; - SessionStatusInfo i = {}; char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; + SessionStatusInfo i = {}; int r; r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); @@ -527,8 +529,8 @@ static int print_seat_status_info(sd_bus *bus, const char *path) { static const struct bus_properties_map map[] = { { "Id", "s", NULL, offsetof(SeatStatusInfo, id) }, - { "ActiveSession", "(so)", &prop_map_first_of_struct, offsetof(SeatStatusInfo, active_session) }, - { "Sessions", "a(so)", &prop_map_sessions_strv, offsetof(SeatStatusInfo, sessions) }, + { "ActiveSession", "(so)", prop_map_first_of_struct, offsetof(SeatStatusInfo, active_session) }, + { "Sessions", "a(so)", prop_map_sessions_strv, offsetof(SeatStatusInfo, sessions) }, {} }; |