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.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_2@23911 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 2135299df06c9b9c8391a36af30fb086e72477e7..e3ae0ef7f6aa6253490fc61109683d1d93142e8c 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/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
 }
 
 /*******************************************************************