← Back to branch summary

~ubuntu-branches/ubuntu/lucid/hal/lucid

« back to all changes in this revision

Viewing changes to tools/hal-storage-mount.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-06-26 10:04:33 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090626100433-nd42rcjbmg5261tx
Tags: 0.5.12+git20090626-0ubuntu1
https://launchpad.net/bugs/384890
* New upstream git snapshot:
  - Add input.keys capability to power/hibernate/etc. keys. (LP: #384890)
* Drop 01_tablet_evdev.patch, 50_no_crash_on_md_blockdev.patch: Applied
  upstream.
* 04_nvidia_brightness.patch: Update to new upstream version.
* debian/control: Change back Vcs-Bzr:, Ubuntu package are only for full
  source trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/hal-storage-mount.c
786
786
                /* don't consider uid= on vfat, iso9660, hfs and udf change-uid for the purpose of policy
787
787
                 * (since these doesn't contain uid/gid bits) 
788
788
                 */
789
 
                if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
790
 
                    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
791
 
                    strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
792
 
                    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
793
 
                    strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 &&
794
 
                    strcmp (libhal_volume_get_fstype (volume), "udf") != 0) {
 
789
                const char *v_fstype;
 
790
 
 
791
                v_fstype = libhal_volume_get_fstype (volume);
 
792
                if (v_fstype != NULL && 
 
793
                    strcmp (v_fstype, "vfat") != 0 && strcmp (v_fstype, "ntfs") != 0 &&
 
794
                    strcmp (v_fstype, "ntfs-3g") != 0 && strcmp (v_fstype, "iso9660") != 0 && 
 
795
                    strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "udf") != 0) {
795
796
                        pol_change_uid = wants_to_change_uid;
796
797
                }
797
798
        }