summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-07-17 04:47:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:41 -0500
commit02730aa86cf187cfcdcb71b07197e0071afd60cd (patch)
tree22e2773755f044492c0ce95fe80e6997d560f24a
parentcfb7c04696f0ac4306a6e1847212fed44f6b2cd5 (diff)
downloadsamba-02730aa86cf187cfcdcb71b07197e0071afd60cd.tar.gz
samba-02730aa86cf187cfcdcb71b07197e0071afd60cd.tar.bz2
samba-02730aa86cf187cfcdcb71b07197e0071afd60cd.zip
r23911: Revert r23910 to try and fix the build farm. I
need to look at this more closely tomorrow. Stevef's cthon tests definately show we're not matching Windows behaviour (as his tests pass against Windows but not SAMBA_3_2) but this isn't the fix. Jeremy. (This used to be commit 90bbc077e15de0493dccda50be9bcdf6e2649137)
-rw-r--r--source3/smbd/reply.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2135299df0..e3ae0ef7f6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1863,12 +1863,6 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp,
return NT_STATUS_NO_SUCH_FILE;
}
-#if 0
- /* We used to deny renames on the
- * source open for non-delete open.
- * Turns out this is not the case.
- * VL please test but this matches
- * Windows behaviour. JRA. */
if (S_ISDIR(pst->st_mode)) {
return NT_STATUS_OK;
}
@@ -1878,9 +1872,6 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp,
}
return NT_STATUS_ACCESS_DENIED;
-#else
- return NT_STATUS_OK;
-#endif
}
/*******************************************************************