upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #21481 from owncloud/ext-smb-dependencies

Browse source 
Check libsmbclient-php as well as smbclient binary
This commit is contained in:
Thomas Müller 2016-01-07 16:19:20 +01:00
commit 629061d00a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_external/lib/smb.php
View file

@ -302,7 +302,9 @@ class SMB extends Common {
* check if smbclient is installed
*/
public static function checkDependencies() {
$smbClientExists = (bool)\OC_Helper::findBinaryPath('smbclient');
return $smbClientExists ? true : array('smbclient');
return (
(bool)\OC_Helper::findBinaryPath('smbclient')
|| Server::NativeAvailable()
) ? true : ['smbclient'];
}
}