hal: Branch 'master'

[Martin Pitt]

 tools/hal-storage-mount.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 25f9536d8cd4ff534eb73dc603a38b7d64ebf81e
Author: Michael Biebl <biebl at debian.org>
Date:   Mon Nov 10 13:33:48 2008 +0100

    allow uid/gid mount option for ntfs
    
    Allow uid/gid mount option for ntfs, as reported in
    http://bugs.debian.org/427109.

diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c
index 741b362..a29c8f3 100644
--- a/tools/hal-storage-mount.c
+++ b/tools/hal-storage-mount.c
@@ -787,6 +787,8 @@ handle_mount (LibHalContext *hal_ctx,
 		 * (since these doesn't contain uid/gid bits) 
 		 */
 		if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
+		    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
+		    strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 &&
 		    strcmp (libhal_volume_get_fstype (volume), "udf") != 0) {