summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2016-01-06 11:51:56 +0000
committerMorris Jobke <hey@morrisjobke.de>2016-01-07 08:56:45 +0100
commitfc52327d2ce4d419e06f372e2eb910523a60aa89 (patch)
tree20f36307bc095ee39c35e1b73bc5b62eae0b69c5 /apps/files_external
parent470bf234c545ae5d0ad9c73834f8a596593791d6 (diff)
downloadnextcloud-server-fc52327d2ce4d419e06f372e2eb910523a60aa89.tar.gz
nextcloud-server-fc52327d2ce4d419e06f372e2eb910523a60aa89.zip
Check libsmbclient-php as well as smbclient binary
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/lib/smb.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 80b44a4cbdf..125e0a6dd2c 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -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'];
}
}