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

Check libsmbclient-php as well as smbclient binary
2016-01-07 16:19:20 +01:00 · 2016-01-07 16:19:20 +01:00 · 629061d00a
parent f6f492ba4e fc52327d2c
commit 629061d00a
1 changed files with 4 additions and 2 deletions
--- 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'];
 	}
 }