diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-02-15 21:58:29 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-02-15 21:58:29 +0000 |
| commit | 8f1f5d8e3799254af76e7cb5eb33fbabed1d2082 (patch) | |
| tree | 7c25dae902e133935f08bf0abaed47d813454e30 /netfs/daemon | |
| parent | Test error cases (diff) | |
| download | netfs-8f1f5d8e3799254af76e7cb5eb33fbabed1d2082.tar.bz2 netfs-8f1f5d8e3799254af76e7cb5eb33fbabed1d2082.tar.xz netfs-8f1f5d8e3799254af76e7cb5eb33fbabed1d2082.zip | |
Test and fix rename behaviour
Diffstat (limited to 'netfs/daemon')
| -rw-r--r-- | netfs/daemon/daemonVolume.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 5064b5b..3ec6865 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -128,13 +128,7 @@ VolumeServer::rename(const NetFS::ReqEnv & re, const std::string & from, const s boost::filesystem::path f(resolvePath(from)); boost::filesystem::path t(resolvePath(to)); mc.AssertWriteParent(f); - mc.AssertWrite(f); - if (boost::filesystem::is_directory(t)) { - mc.AssertWrite(t); - } - else { - mc.AssertWriteParent(t); - } + mc.AssertWriteParent(t); if (::rename(f.c_str(), t.c_str()) != 0) { throw NetFS::SystemError(errno); } |