chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: make sure %m resolves to the specified error in bus_error_set_errnofv()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
busctl.c
diff --git
a/src/libsystemd/sd-bus/busctl.c
b/src/libsystemd/sd-bus/busctl.c
index b4a91dfed3f4e649520e0f045fbab3cff702a133..febfc98a59f9834b55101669ead109b6360fb7d2 100644
(file)
--- a/
src/libsystemd/sd-bus/busctl.c
+++ b/
src/libsystemd/sd-bus/busctl.c
@@
-1193,11
+1193,18
@@
static int status(sd_bus *bus, char *argv[]) {
&creds,
pid,
_SD_BUS_CREDS_ALL);
&creds,
pid,
_SD_BUS_CREDS_ALL);
- } else
+ } else {
+ const char *scope;
+
+ r = sd_bus_get_scope(bus, &scope);
+ if (r >= 0)
+ printf("Scope=%s%s%s\n", ansi_highlight(), scope, ansi_highlight_off());
+
r = sd_bus_get_owner_creds(
bus,
(arg_augment_creds ? SD_BUS_CREDS_AUGMENT : 0) | _SD_BUS_CREDS_ALL,
&creds);
r = sd_bus_get_owner_creds(
bus,
(arg_augment_creds ? SD_BUS_CREDS_AUGMENT : 0) | _SD_BUS_CREDS_ALL,
&creds);
+ }
if (r < 0) {
log_error_errno(r, "Failed to get credentials: %m");
if (r < 0) {
log_error_errno(r, "Failed to get credentials: %m");
@@
-2006,10
+2013,13
@@
int main(int argc, char *argv[]) {
switch (arg_transport) {
case BUS_TRANSPORT_LOCAL:
switch (arg_transport) {
case BUS_TRANSPORT_LOCAL:
- if (arg_user)
+ if (arg_user) {
+ bus->is_user = true;
r = bus_set_address_user(bus);
r = bus_set_address_user(bus);
- else
+ } else {
+ bus->is_system = true;
r = bus_set_address_system(bus);
r = bus_set_address_system(bus);
+ }
break;
case BUS_TRANSPORT_REMOTE:
break;
case BUS_TRANSPORT_REMOTE: