hal: Branch 'master' - 2 commits

[Holger Macht]

 privileges/hal-power-cpufreq.privilege   |    6 +++---
 privileges/hal-power-hibernate.privilege |    6 +++---
 privileges/hal-power-suspend.privilege   |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
diff-tree af0658e1afae94aebcaf00fcffa8fccdec1d5cba (from parents)
Merge: 8220fb7a1fc3e17470bde7161de6cc66f3fdd0f9 916c9b2d7291561ef53cc1a96f28c4801d1eb0b7
Author: Holger Macht <holger at homac.de>
Date:   Tue Mar 27 17:41:27 2007 +0200

    Merge branch 'master' of git+ssh://homac@git.freedesktop.org/git/hal

diff-tree 8220fb7a1fc3e17470bde7161de6cc66f3fdd0f9 (from 28fc2fa7c6bbde540d4f17e810ab59fda0c186ba)
Author: Holger Macht <holger at homac.de>
Date:   Tue Mar 27 17:40:09 2007 +0200

    allow hibernate, suspend and CPUFreq for the root user independent of desktop-console
    
    This changes the logic how privileges for hibernate, suspend and cpufreq
    are determined. Now, the root user is granted to do hibernate, suspend and
    all CPUFreq methods with no regard to the desktop-console privilege. In the
    past, the application/script checking if the caller is allowed to do
    something, had to explicitly grant access for the root user with checking
    for uid == 0. The new method exclusively grants access for the root user,
    but specifies that others can possess the privilege as soon as they possess
    the desktop-console privilege. This way, the lower lever application/script
    does not have to handle any special case, it just has to check if the
    caller (whether root or not) possesses the specific privilege.

diff --git a/privileges/hal-power-cpufreq.privilege b/privileges/hal-power-cpufreq.privilege
index cee08b4..49df022 100644
--- a/privileges/hal-power-cpufreq.privilege
+++ b/privileges/hal-power-cpufreq.privilege
@@ -3,9 +3,9 @@
 # via the org.freedesktop.Hal.Device.CPUFreq interface
 
 [Privilege]
-RequiredPrivileges=desktop-console
-SufficientPrivileges=
-Allow=uid:__all__
+RequiredPrivileges=
+SufficientPrivileges=desktop-console
+Allow=uid:root
 Deny=
 CanObtain=True
 CanGrant=True
diff --git a/privileges/hal-power-hibernate.privilege b/privileges/hal-power-hibernate.privilege
index d93c4bd..0fd5037 100644
--- a/privileges/hal-power-hibernate.privilege
+++ b/privileges/hal-power-hibernate.privilege
@@ -2,9 +2,9 @@
 # This privilege specifies who is allowed to hibernate the system.
 
 [Privilege]
-RequiredPrivileges=desktop-console
-SufficientPrivileges=
-Allow=uid:__all__
+RequiredPrivileges=
+SufficientPrivileges=desktop-console
+Allow=uid:root
 Deny=
 CanObtain=True
 CanGrant=True
diff --git a/privileges/hal-power-suspend.privilege b/privileges/hal-power-suspend.privilege
index fb20576..2f39d07 100644
--- a/privileges/hal-power-suspend.privilege
+++ b/privileges/hal-power-suspend.privilege
@@ -2,9 +2,9 @@
 # This privilege specifies who is allowed to suspend the system.
 
 [Privilege]
-RequiredPrivileges=desktop-console
-SufficientPrivileges=
-Allow=uid:__all__
+RequiredPrivileges=
+SufficientPrivileges=desktop-console
+Allow=uid:root
 Deny=
 CanObtain=True
 CanGrant=True