Author: jra
Date: 2007-07-17 04:47:36 +0000 (Tue, 17 Jul 2007)
New Revision: 23911

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23911

Log:
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.

Modified:
   branches/SAMBA_3_2/source/smbd/reply.c
   branches/SAMBA_3_2_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/reply.c      2007-07-17 02:17:23 UTC (rev 
23910)
+++ branches/SAMBA_3_2/source/smbd/reply.c      2007-07-17 04:47:36 UTC (rev 
23911)
@@ -1863,12 +1863,6 @@
                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 @@
        }
 
        return NT_STATUS_ACCESS_DENIED;
-#else
-       return NT_STATUS_OK;
-#endif
 }
 
 /*******************************************************************

Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/reply.c    2007-07-17 02:17:23 UTC (rev 
23910)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c    2007-07-17 04:47:36 UTC (rev 
23911)
@@ -1862,12 +1862,6 @@
                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;
        }
@@ -1877,9 +1871,6 @@
        }
 
        return NT_STATUS_ACCESS_DENIED;
-#else
-       return NT_STATUS_OK;
-#endif
 }
 
 /*******************************************************************

Reply via email to