also track newer CIFS

(cherry picked from commit 375b390)
qgis · Nov 18, 2019 · 54a2e79 · 54a2e79
1 parent 4eb78ea
commit 54a2e79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -4036,7 +4036,8 @@ static bool IsLocalFile( const QString &path )
     // Codes from http://man7.org/linux/man-pages/man2/statfs.2.html
     if ( sStatFS.f_type == 0x6969 /* NFS */ ||
          sStatFS.f_type == 0x517b /* SMB */ ||
-         sStatFS.f_type == 0xff534d42 /* CIFS */ )
+         sStatFS.f_type == 0xff534d42 /* CIFS */ ||
+         sStatFS.f_type == 0xfe534d42 /* CIFS */ )
     {
       return false;
     }

diff --git a/src/server/qgscapabilitiescache.cpp b/src/server/qgscapabilitiescache.cpp
@@ -73,7 +73,8 @@ void QgsCapabilitiesCache::insertCapabilitiesDocument( const QString &configFile
   if ( statfs( configFilePath.toUtf8().constData(), &sStatFS ) == 0 &&
        ( sStatFS.f_type == 0x6969 /* NFS */ ||
          sStatFS.f_type == 0x517b /* SMB */ ||
-         sStatFS.f_type == 0xff534d42 /* CIFS */ ) )
+         sStatFS.f_type == 0xff534d42 /* CIFS */ ||
+         sStatFS.f_type == 0xfe534d42 /* CIFS */ ) )
   {
     QFileInfo fi( configFilePath );
     mCachedCapabilitiesTimestamps[ configFilePath ] = fi.lastModified();