svn commit: samba r20658 - in branches/SAMBA_3_0_24/source/smbd: .
jra at samba.org
jra at samba.org
Wed Jan 10 18:23:07 GMT 2007
Author: jra
Date: 2007-01-10 18:23:06 +0000 (Wed, 10 Jan 2007)
New Revision: 20658
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20658
Log:
Now up to passing 108 operations on gentest.....
Jeremy.
Modified:
branches/SAMBA_3_0_24/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/reply.c 2007-01-10 18:20:53 UTC (rev 20657)
+++ branches/SAMBA_3_0_24/source/smbd/reply.c 2007-01-10 18:23:06 UTC (rev 20658)
@@ -1679,6 +1679,7 @@
SMB_STRUCT_STAT sbuf;
uint32 fattr;
files_struct *fsp;
+ uint32 dirtype_orig = dirtype;
NTSTATUS status;
DEBUG(10,("can_delete: %s, dirtype = %d\n", fname, dirtype ));
@@ -1693,11 +1694,6 @@
fattr = dos_mode(conn,fname,&sbuf);
- if (dirtype & 0x8000) {
- /* These will never be set for POSIX. */
- return NT_STATUS_NO_SUCH_FILE;
- }
-
if (dirtype == FILE_ATTRIBUTE_NORMAL) {
dirtype = aDIR|aARCH|aRONLY;
}
@@ -1714,6 +1710,11 @@
return NT_STATUS_NO_SUCH_FILE;
}
+ if (dirtype_orig & 0x8000) {
+ /* These will never be set for POSIX. */
+ return NT_STATUS_NO_SUCH_FILE;
+ }
+
#if 0
if ((fattr & dirtype) & FILE_ATTRIBUTE_DIRECTORY) {
return NT_STATUS_FILE_IS_A_DIRECTORY;
More information about the samba-cvs
mailing list