chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove "to allow" from policy messages
[elogind.git]
/
src
/
login
/
org.freedesktop.login1.policy.in
diff --git
a/src/login/org.freedesktop.login1.policy.in
b/src/login/org.freedesktop.login1.policy.in
index 57dfb2a8b63eb5473d1b027cd3090fa38ac05a13..49094eeddb3d8bee629399b8d180bd8e8ee626f5 100644
(file)
--- a/
src/login/org.freedesktop.login1.policy.in
+++ b/
src/login/org.freedesktop.login1.policy.in
@@
-18,37
+18,40
@@
<action id="org.freedesktop.login1.inhibit-block-shutdown">
<_description>Allow applications to inhibit system shutdown</_description>
<action id="org.freedesktop.login1.inhibit-block-shutdown">
<_description>Allow applications to inhibit system shutdown</_description>
- <_message>Authentication is required
to allow
an application to inhibit system shutdown.</_message>
+ <_message>Authentication is required
for
an application to inhibit system shutdown.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.inhibit-delay-shutdown org.freedesktop.login1.inhibit-block-sleep org.freedesktop.login1.inhibit-delay-sleep org.freedesktop.login1.inhibit-block-idle</annotate>
</action>
<action id="org.freedesktop.login1.inhibit-delay-shutdown">
<_description>Allow applications to delay system shutdown</_description>
</action>
<action id="org.freedesktop.login1.inhibit-delay-shutdown">
<_description>Allow applications to delay system shutdown</_description>
- <_message>Authentication is required
to allow
an application to delay system shutdown.</_message>
+ <_message>Authentication is required
for
an application to delay system shutdown.</_message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.inhibit-delay-sleep</annotate>
</action>
<action id="org.freedesktop.login1.inhibit-block-sleep">
<_description>Allow applications to inhibit system sleep</_description>
</action>
<action id="org.freedesktop.login1.inhibit-block-sleep">
<_description>Allow applications to inhibit system sleep</_description>
- <_message>Authentication is required
to allow
an application to inhibit system sleep.</_message>
+ <_message>Authentication is required
for
an application to inhibit system sleep.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.inhibit-delay-sleep org.freedesktop.login1.inhibit-block-idle</annotate>
</action>
<action id="org.freedesktop.login1.inhibit-delay-sleep">
<_description>Allow applications to delay system sleep</_description>
</action>
<action id="org.freedesktop.login1.inhibit-delay-sleep">
<_description>Allow applications to delay system sleep</_description>
- <_message>Authentication is required
to allow
an application to delay system sleep.</_message>
+ <_message>Authentication is required
for
an application to delay system sleep.</_message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
@@
-58,7
+61,7
@@
<action id="org.freedesktop.login1.inhibit-block-idle">
<_description>Allow applications to inhibit automatic system suspend</_description>
<action id="org.freedesktop.login1.inhibit-block-idle">
<_description>Allow applications to inhibit automatic system suspend</_description>
- <_message>Authentication is required
to allow
an application to inhibit automatic system suspend.</_message>
+ <_message>Authentication is required
for
an application to inhibit automatic system suspend.</_message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
@@
-68,27
+71,29
@@
<action id="org.freedesktop.login1.inhibit-handle-power-key">
<_description>Allow applications to inhibit system handling of the power key</_description>
<action id="org.freedesktop.login1.inhibit-handle-power-key">
<_description>Allow applications to inhibit system handling of the power key</_description>
- <_message>Authentication is required
to allow
an application to inhibit system handling of the power key.</_message>
+ <_message>Authentication is required
for
an application to inhibit system handling of the power key.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.inhibit-handle-suspend-key org.freedesktop.login1.inhibit-handle-hibernate-key org.freedesktop.login1.inhibit-handle-lid-switch</annotate>
</action>
<action id="org.freedesktop.login1.inhibit-handle-suspend-key">
<_description>Allow applications to inhibit system handling of the suspend key</_description>
</action>
<action id="org.freedesktop.login1.inhibit-handle-suspend-key">
<_description>Allow applications to inhibit system handling of the suspend key</_description>
- <_message>Authentication is required
to allow
an application to inhibit system handling of the suspend key.</_message>
+ <_message>Authentication is required
for
an application to inhibit system handling of the suspend key.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.inhibit-handle-hibernate-key org.freedesktop.login1.inhibit-handle-lid-switch</annotate>
</action>
<action id="org.freedesktop.login1.inhibit-handle-hibernate-key">
<_description>Allow applications to inhibit system handling of the hibernate key</_description>
</action>
<action id="org.freedesktop.login1.inhibit-handle-hibernate-key">
<_description>Allow applications to inhibit system handling of the hibernate key</_description>
- <_message>Authentication is required
to allow
an application to inhibit system handling of the hibernate key.</_message>
+ <_message>Authentication is required
for
an application to inhibit system handling of the hibernate key.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
@@
-98,7
+103,7
@@
<action id="org.freedesktop.login1.inhibit-handle-lid-switch">
<_description>Allow applications to inhibit system handling of the lid switch</_description>
<action id="org.freedesktop.login1.inhibit-handle-lid-switch">
<_description>Allow applications to inhibit system handling of the lid switch</_description>
- <_message>Authentication is required
to allow
an application to inhibit system handling of the lid switch.</_message>
+ <_message>Authentication is required
for
an application to inhibit system handling of the lid switch.</_message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>yes</allow_inactive>
@@
-108,7
+113,7
@@
<action id="org.freedesktop.login1.set-user-linger">
<_description>Allow non-logged-in users to run programs</_description>
<action id="org.freedesktop.login1.set-user-linger">
<_description>Allow non-logged-in users to run programs</_description>
- <_message>Authentication is required to
allow a non-logged-in user to run programs
.</_message>
+ <_message>Authentication is required to
run programs as a non-logged-in user
.</_message>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
@@
-124,6
+129,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.flush-devices</annotate>
</action>
<action id="org.freedesktop.login1.flush-devices">
</action>
<action id="org.freedesktop.login1.flush-devices">
@@
-152,8
+158,9
@@
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>
auth_admin_keep
</allow_active>
+ <allow_active>
yes
</allow_active>
</defaults>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.power-off</annotate>
</action>
<action id="org.freedesktop.login1.power-off-ignore-inhibit">
</action>
<action id="org.freedesktop.login1.power-off-ignore-inhibit">
@@
-164,6
+171,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.power-off</annotate>
</action>
<action id="org.freedesktop.login1.reboot">
</action>
<action id="org.freedesktop.login1.reboot">
@@
-182,8
+190,9
@@
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>
auth_admin_keep
</allow_active>
+ <allow_active>
yes
</allow_active>
</defaults>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
</action>
<action id="org.freedesktop.login1.reboot-ignore-inhibit">
</action>
<action id="org.freedesktop.login1.reboot-ignore-inhibit">
@@
-194,6
+203,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
</action>
<action id="org.freedesktop.login1.suspend">
</action>
<action id="org.freedesktop.login1.suspend">
@@
-214,6
+224,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.suspend</annotate>
</action>
<action id="org.freedesktop.login1.suspend-ignore-inhibit">
</action>
<action id="org.freedesktop.login1.suspend-ignore-inhibit">
@@
-224,6
+235,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.suspend</annotate>
</action>
<action id="org.freedesktop.login1.hibernate">
</action>
<action id="org.freedesktop.login1.hibernate">
@@
-242,8
+254,9
@@
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
<defaults>
<allow_any>auth_admin_keep</allow_any>
<allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>
auth_admin_keep
</allow_active>
+ <allow_active>
yes
</allow_active>
</defaults>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.hibernate</annotate>
</action>
<action id="org.freedesktop.login1.hibernate-ignore-inhibit">
</action>
<action id="org.freedesktop.login1.hibernate-ignore-inhibit">
@@
-254,6
+267,7
@@
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
+ <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.hibernate</annotate>
</action>
</policyconfig>
</action>
</policyconfig>