VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-02-21 00:47:48 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-02-21 10:59:11 +0100
commitfaf00ca1e093f0240f3cc668532f38b15e268da3 (patch)
treed98ab6f8cea6ff8c832027b1a3a99e656ef753d5
parentb331668c06fb1ee4c57fd3d6fee39fec4e00e04c (diff)
downloadVeraCrypt-faf00ca1e093f0240f3cc668532f38b15e268da3.tar.gz
VeraCrypt-faf00ca1e093f0240f3cc668532f38b15e268da3.zip
MacOSX: Correctly detect newer versions of OSXFuse
-rwxr-xr-x[-rw-r--r--]src/Core/Unix/MacOSX/CoreMacOSX.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
index 70dc3301..b2a10017 100644..100755
--- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp
+++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp
@@ -124,19 +124,21 @@ namespace VeraCrypt
fuseVersionStringLength = MAXHOSTNAMELEN;
if ((status = sysctlbyname ("osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
{
- throw HigherFuseVersionRequired (SRC_POS);
- }
- else
- {
- // look for compatibility mode
- struct stat sb;
- if ((0 == stat("/usr/local/lib/libfuse.dylib", &sb)) && (0 == stat("/Library/Frameworks/MacFUSE.framework/MacFUSE", &sb)))
+ fuseVersionStringLength = MAXHOSTNAMELEN;
+ if ((status = sysctlbyname ("vfs.generic.osxfuse.version.number", fuseVersionString, &fuseVersionStringLength, NULL, 0)) != 0)
{
- bIsOSXFuse = true;
- }
- else
throw HigherFuseVersionRequired (SRC_POS);
+ }
}
+
+ // look for compatibility mode
+ struct stat sb;
+ if ((0 == stat("/usr/local/lib/libfuse.dylib", &sb)) && (0 == stat("/Library/Frameworks/MacFUSE.framework/MacFUSE", &sb)))
+ {
+ bIsOSXFuse = true;
+ }
+ else
+ throw HigherFuseVersionRequired (SRC_POS);
}