ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mountmgr: Avoid unnecessary permission prompts on macOS 10.15 and newer. 

On macOS 10.15 and newer, trying to open the device node of a removable
drive will trigger an "<app> would like to access files on a removable
volume" permission prompt, even if the user doesn't have permissions
to access the device node (which is almost always the case).

Check the value of access() (recommended by Apple for this purpose)
before opening devices.

Signed-off-by: Brendan Shanks <bshanks@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Brendan Shanks 2020-10-06 13:36:28 -07:00 committed by Alexandre Julliard
parent f7edc32818
commit 33c8a42547
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/mountmgr.sys/device.c
View File

@ -26,6 +26,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/time.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
@ -1026,6 +1027,14 @@ static BOOL get_volume_device_info( struct volume *volume )
if (!unix_device)
return FALSE;
#ifdef __APPLE__
if (access( unix_device, R_OK ))
{
WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device));
return FALSE;
}
#endif
if (!(name = wine_get_dos_file_name( unix_device )))
{
ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError());

4
dlls/mountmgr.sys/diskarb.c
View File

@ -25,6 +25,7 @@
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
@ -150,7 +151,8 @@ static void appeared_callback( DADiskRef disk, void *context )
else
if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL );
if ((fd = open( device, O_RDONLY )) >= 0)
if (!access( device, R_OK ) &&
(fd = open( device, O_RDONLY )) >= 0)
{
dk_scsi_identify_t dsi;