Skip to content

Stable9 smb cherry-pciks #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LukasReschke wants to merge 17 commits into from
Closed

Stable9 smb cherry-pciks #1151

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
51d811d
Fix file permissions for SMB (read-only folders will be writeable) (#…
jvillafanez Aug 12, 2016
f39a2f4
add conditional smb trace logging for debug purposes
butonic Aug 16, 2016
fde188e
stat for root of a share does not work
butonic Aug 16, 2016
a6882ee
don't list hidden files
butonic Aug 16, 2016
981065c
formatInfo should include type
butonic Aug 16, 2016
0d47c1b
overwrite target on rename
butonic Aug 16, 2016
f0ddca0
use stat to determine has updated
butonic Aug 16, 2016
bd5ee22
stat now handles mtime for root shares, simplify hasUpdated
butonic Aug 16, 2016
d86d5bf
move share check to getFileInfo
butonic Aug 18, 2016
e79d00f
always try stat, fake if forbidden, actually return the fileinfo array
butonic Aug 18, 2016
9c32080
share root is always readable
butonic Aug 18, 2016
acecb36
do not overwrite stat cache with plain array
butonic Aug 22, 2016
a5a222d
fix test execution due to connection limit
butonic Aug 23, 2016
271c500
add dir based stat fallback
butonic Aug 24, 2016
d371aaa
fix return values for smbclient backend
butonic Aug 24, 2016
0b7c8d3
allow unhiding root folder in subfolder of share
butonic Aug 24, 2016
f1de117
trust libsmbclient on stat, only do dir fallback for smbclient
butonic Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stat now handles mtime for root shares, simplify hasUpdated
  • Loading branch information
@butonic @LukasReschke
butonic authored and LukasReschke committed Aug 29, 2016
commit bd5ee22d8f549969e0673480c05043beb3cbe013
10 changes: 2 additions & 8 deletions apps/files_external/lib/smb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,8 @@ public function unlink($path) {
*/
public function hasUpdated($path, $time) {
$this->log('enter: '.__FUNCTION__."($path, $time)");
$stat = $this->stat($path);
if ($stat === false) {
Util::writeLog('wnd', 'hasUpdated failed -> storage not available', Util::ERROR);
throw $this->leave(__FUNCTION__, new StorageNotAvailableException());
} else {
$actualTime = $this->filemtime($path);
$result = $actualTime > $time;
}
$actualTime = $this->filemtime($path);
$result = $actualTime > $time;
return $this->leave(__FUNCTION__, $result);
}

Expand Down