|
Lines 792-798
Link Here
|
| 792 |
acl_entry_t entry; |
792 |
acl_entry_t entry; |
| 793 |
acl_permset_t permset; |
793 |
acl_permset_t permset; |
| 794 |
|
794 |
|
| 795 |
acl = acl_get_file(path, ACL_TYPE_ACCESS); |
795 |
acl = acl_get_file (path, ACL_TYPE_ACCESS); |
|
|
796 |
|
| 797 |
/* Don't set error if ACLs are not supported */ |
| 798 |
if (acl == NULL && errno == ENOTSUP) |
| 799 |
return ret; |
| 800 |
|
| 796 |
if (acl == NULL || |
801 |
if (acl == NULL || |
| 797 |
acl_create_entry (&acl, &entry) == -1 || |
802 |
acl_create_entry (&acl, &entry) == -1 || |
| 798 |
acl_set_tag_type (entry, ACL_USER) == -1 || |
803 |
acl_set_tag_type (entry, ACL_USER) == -1 || |
|
Lines 894-906
Link Here
|
| 894 |
{ |
899 |
{ |
| 895 |
if (rmdir (mount_dir) != 0) |
900 |
if (rmdir (mount_dir) != 0) |
| 896 |
udisks_warning ("Error calling rmdir() on %s: %m", mount_dir); |
901 |
udisks_warning ("Error calling rmdir() on %s: %m", mount_dir); |
| 897 |
goto out; |
902 |
/* Fallback to default way if there was no error, that |
|
|
903 |
* means ACLs are not supported |
| 904 |
*/ |
| 905 |
if (*error != NULL) |
| 906 |
goto out; |
| 898 |
} |
907 |
} |
| 899 |
} |
908 |
} |
| 900 |
} |
909 |
} |
| 901 |
/* otherwise fall back to mounting in /media */ |
910 |
/* otherwise fall back to mounting in /media */ |
| 902 |
if (mount_dir == NULL) |
911 |
if (mount_dir != NULL) |
| 903 |
mount_dir = g_strdup ("/media"); |
912 |
g_free(mount_dir); |
|
|
913 |
|
| 914 |
mount_dir = g_strdup ("/media"); |
| 904 |
|
915 |
|
| 905 |
/* NOTE: UTF-8 has the nice property that valid UTF-8 strings only contains |
916 |
/* NOTE: UTF-8 has the nice property that valid UTF-8 strings only contains |
| 906 |
* the byte 0x2F if it's for the '/' character (U+002F SOLIDUS). |
917 |
* the byte 0x2F if it's for the '/' character (U+002F SOLIDUS). |
