chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddcbc87
)
logind: interpret the can_sleep return value properly
author
Matthias Clasen
<mclasen@redhat.com>
Fri, 1 Jun 2012 01:50:23 +0000
(21:50 -0400)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 1 Jun 2012 13:58:21 +0000
(15:58 +0200)
can_sleep() returns a boolean, so a return value > 0 does not
mean 'na'.
src/login/logind-dbus.c
patch
|
blob
|
history
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index 6175d57d8c34fc59a22e76d99aa326f528d68696..f4b232b9ae2134cbb40346eddf5476614311e909 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-1068,8
+1068,10
@@
static int bus_manager_can_shutdown_or_sleep(
if (r < 0)
return r;
if (r < 0)
return r;
- result = "na";
- goto finish;
+ if (r == 0) {
+ result = "na";
+ goto finish;
+ }
}
r = have_multiple_sessions(connection, m, message, error);
}
r = have_multiple_sessions(connection, m, message, error);