diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 16:19:20 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 16:19:20 +0100 |
| commit | 629061d00a936b1755d06f7cb98cd12be06718af (patch) | |
| tree | ed7e814a589c104ca08cb93e53279221215a5b2a /apps/files_external | |
| parent | f6f492ba4e72b82e6f144f912536cfd7b664c491 (diff) | |
| parent | fc52327d2ce4d419e06f372e2eb910523a60aa89 (diff) | |
| download | nextcloud-server-629061d00a936b1755d06f7cb98cd12be06718af.tar.gz nextcloud-server-629061d00a936b1755d06f7cb98cd12be06718af.zip | |
Merge pull request #21481 from owncloud/ext-smb-dependencies
Check libsmbclient-php as well as smbclient binary
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/smb.php | 6 |
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']; } } |