diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-01-17 14:57:35 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-01-17 14:57:35 +0300 |
| commit | 026a66abecea3e3a54cdbfb97129d5e65608e5df (patch) | |
| tree | 549c3c1e1a715a020b4f3b1fa6160f6d2d071269 /source3/smbd | |
| parent | 6de904b836f4fdf5b0b027a09554afe3c13e05ca (diff) | |
| download | samba-026a66abecea3e3a54cdbfb97129d5e65608e5df.tar.gz samba-026a66abecea3e3a54cdbfb97129d5e65608e5df.tar.bz2 samba-026a66abecea3e3a54cdbfb97129d5e65608e5df.zip | |
Rework of VFS is_offline() function to only return boolean offline/online result for a file.
This makes sense as upper levels are only taking returned result of 0
(no error) into consideration when deciding whether to mark file
offline/online as returned from is_offline.
That means that we simply can move the decision down to VFS module and
clean up upper levels so that they always see only file status. If there
is an error when trying to identify file status, then VFS module could
decide what to return (offline or online) by itself -- after all, it
ought to have system-specific knowledge anyway.
(This used to be commit 75cc08661473cce62756fa062071bb2bc1fb39ec)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/dosmode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 2021621dfa..eb18f65fca 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -350,7 +350,6 @@ uint32 dos_mode(connection_struct *conn, const char *path,SMB_STRUCT_STAT *sbuf) { uint32 result = 0; bool offline; - int ret; DEBUG(8,("dos_mode: %s\n", path)); @@ -381,8 +380,8 @@ uint32 dos_mode(connection_struct *conn, const char *path,SMB_STRUCT_STAT *sbuf) } - ret = SMB_VFS_IS_OFFLINE(conn, path, sbuf, &offline); - if (S_ISREG(sbuf->st_mode) && (ret == 0) && offline) { + offline = SMB_VFS_IS_OFFLINE(conn, path, sbuf); + if (S_ISREG(sbuf->st_mode) && offline) { result |= FILE_ATTRIBUTE_OFFLINE; } |