hal: Branch 'master' - 2 commits

[David Zeuthen]

 hald/linux/osspec.c         |    2 --
 privileges/hal-storage.priv |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
diff-tree b20d801f2d25e727d0461e903ca6d8c6d38b3f72 (from 77ecc2310130d6fd712cb40b3080e5e67dd4b544)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sat Apr 7 12:33:54 2007 -0400

    don't include hal-file-monitor.c in hald/linux/osspec.c
    
    This makes 'make distcheck' happy again.

diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index b8900d5..67e1be9 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -56,8 +56,6 @@
 #include "../util.h"
 #include "../ids.h"
 
-#include "hal-file-monitor.h"
-
 #include "acpi.h"
 #include "apm.h"
 #include "blockdev.h"
diff-tree 77ecc2310130d6fd712cb40b3080e5e67dd4b544 (from 5d5b66fdca8caf8c985f1990f9f6bc7ec18d92ed)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sat Apr 7 12:27:47 2007 -0400

    add the "-extra-options" privileges for mounting
    
    This still needs some rethinking; we should probably test for this
    privilege even if the user asks for options not already mentioned in
    the volume.valid_options property.

diff --git a/privileges/hal-storage.priv b/privileges/hal-storage.priv
index 2022833..3c67964 100644
--- a/privileges/hal-storage.priv
+++ b/privileges/hal-storage.priv
@@ -20,6 +20,13 @@ AllowRemoteActive=no
 AllowLocalInactive=no
 AllowLocalActive=auth_self_keep_always
 
+# Mount file systems from internal drives using options not explicitly granted
+[Privilege hal-storage-mount-fixed-extra-options]
+AllowRemoteInactive=no
+AllowRemoteActive=no
+AllowLocalInactive=no
+AllowLocalActive=auth_self_keep_always
+
 # Mount file systems from removable/hotpluggable drives
 [Privilege hal-storage-mount-removable]
 AllowRemoteInactive=no
@@ -27,6 +34,13 @@ AllowRemoteActive=no
 AllowLocalInactive=no
 AllowLocalActive=yes
 
+# Mount file systems from internal drives using options not explicitly granted
+[Privilege hal-storage-mount-removable-extra-options]
+AllowRemoteInactive=no
+AllowRemoteActive=no
+AllowLocalInactive=no
+AllowLocalActive=auth_self_keep_always
+
 # Unmount file systems mounted by other users
 [Privilege hal-storage-unmount-others]
 AllowRemoteInactive=no