svn commit: samba r20424 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_24/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2006-12-30 17:54:22 +0000 (Sat, 30 Dec 2006)
New Revision: 20424

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

Log:
No, we do not have to do that here :-)
Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c
   branches/SAMBA_3_0_24/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2006-12-30 17:53:28 UTC (rev 20423)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2006-12-30 17:54:22 UTC (rev 20424)
@@ -4807,7 +4807,6 @@
 	BOOL bad_path = False;
 	NTSTATUS status = NT_STATUS_OK;
 	struct ea_list *ea_list = NULL;
-	files_struct *fsp;
 
 	if (!CAN_WRITE(conn))
 		return ERROR_DOS(ERRSRV,ERRaccess);
@@ -4865,22 +4864,11 @@
 					  ERRnoaccess);
 	}
 
-	status = open_directory(conn, directory, &sbuf, 
-				FILE_READ_ATTRIBUTES, /* A stat open */
-				FILE_SHARE_NONE, /* Ignored  */
-				FILE_CREATE, 0, NULL, &fsp);
+	status = create_directory(conn, directory);
 
 	if (!NT_STATUS_IS_OK(status)) {
-#if 0
-		/* Do we need to do this here ? Need smbtorture test. JRA. */
-		if (!use_nt_status() && NT_STATUS_EQUAL(
-				status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-			status = NT_STATUS_DOS(ERRDOS, ERRfilexists);
-		}
-#endif
 		return ERROR_NT(status);
 	}
-	close_file(fsp, NORMAL_CLOSE);
   
 	/* Try and set any given EA. */
 	if (ea_list) {

Modified: branches/SAMBA_3_0_24/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/trans2.c	2006-12-30 17:53:28 UTC (rev 20423)
+++ branches/SAMBA_3_0_24/source/smbd/trans2.c	2006-12-30 17:54:22 UTC (rev 20424)
@@ -4807,7 +4807,6 @@
 	BOOL bad_path = False;
 	NTSTATUS status = NT_STATUS_OK;
 	struct ea_list *ea_list = NULL;
-	files_struct *fsp;
 
 	if (!CAN_WRITE(conn))
 		return ERROR_DOS(ERRSRV,ERRaccess);
@@ -4865,23 +4864,11 @@
 					  ERRnoaccess);
 	}
 
-	status = open_directory(conn, directory, &sbuf, 
-				FILE_READ_ATTRIBUTES, /* A stat open */
-				FILE_SHARE_NONE, /* Ignored  */
-				FILE_CREATE, 0, NULL, &fsp);
+	status = create_directory(conn, directory);
 
 	if (!NT_STATUS_IS_OK(status)) {
-#if 0
-		/* Do we need to do this here ? Need smbtorture test. JRA. */
-		if (!use_nt_status() && NT_STATUS_EQUAL(
-					status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-			status = NT_STATUS_DOS(ERRDOS, ERRfilexists);
-		}
-#endif
 		return ERROR_NT(status);
 	}
-
-	close_file(fsp, NORMAL_CLOSE);
   
 	/* Try and set any given EA. */
 	if (ea_list) {