chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
polkit: rename bus_verify_polkit() to bus_test_polkit() and make it strictly non...
[elogind.git]
/
src
/
login
/
logind-dbus.c
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index e929e22de709596d38ccf2d94c84dc873a9b1564..8bdb2457dbc45188dec35e29cb9920ae911de32c 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-1729,7
+1729,7
@@
static int method_can_shutdown_or_sleep(
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
if (multiple_sessions) {
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
if (multiple_sessions) {
- r = bus_
verify_polkit(message, CAP_SYS_BOOT, action_multiple_sessions, false
, UID_INVALID, &challenge, error);
+ r = bus_
test_polkit(message, CAP_SYS_BOOT, action_multiple_sessions
, UID_INVALID, &challenge, error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1742,7
+1742,7
@@
static int method_can_shutdown_or_sleep(
}
if (blocked) {
}
if (blocked) {
- r = bus_
verify_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit, false
, UID_INVALID, &challenge, error);
+ r = bus_
test_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit
, UID_INVALID, &challenge, error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1758,7
+1758,7
@@
static int method_can_shutdown_or_sleep(
/* If neither inhibit nor multiple sessions
* apply then just check the normal policy */
/* If neither inhibit nor multiple sessions
* apply then just check the normal policy */
- r = bus_
verify_polkit(message, CAP_SYS_BOOT, action, false
, UID_INVALID, &challenge, error);
+ r = bus_
test_polkit(message, CAP_SYS_BOOT, action
, UID_INVALID, &challenge, error);
if (r < 0)
return r;
if (r < 0)
return r;