Merge pull request #33 from owncloud/fixing-3466

smb4php: - initialize $stat with false - fix regex for connection failed
owncloud-archive · Jun 7, 2013 · 3ef9f73 · 3ef9f73
2 parents d59b017 + 5857af7
commit 3ef9f73
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/smb4php/smb.php b/smb4php/smb.php
@@ -98,7 +98,7 @@ function client ($params, $purl) {
 			'^(.*): ERRSRV - ERRbadpw' => 'error',
 			'^Error returning browse list: (.*)$' => 'error',
 			'^tree connect failed: (.*)$' => 'error',
-			'^(Connection to .* failed)$' => 'error',
+			'^(Connection to .* failed)(.*)$' => 'error-connect',
 			'^NT_STATUS_(.*) ' => 'error',
 			'^NT_STATUS_(.*)\$' => 'error',
 			'ERRDOS - ERRbadpath \((.*).\)' => 'error',
@@ -185,6 +185,8 @@ function client ($params, $purl) {
 						return false;
 					}
 					trigger_error($regs[0].' params('.$params.')', E_USER_ERROR);
+				case 'error-connect':
+					return false;
 			}
 			if ($i) switch ($i[1]) {
 				case 'file':
@@ -214,7 +216,7 @@ function url_stat ($url, $flags = STREAM_URL_STAT_LINK) {
 		if ($s = smb::getstatcache($url)) {
 			return $s;
 		}
-		list ($stat, $pu) = array (array (), smb::parse_url ($url));
+		list ($stat, $pu) = array (false, smb::parse_url ($url));
 		switch ($pu['type']) {
 			case 'host':
 				if ($o = smb::look ($pu))