r20424: No, we do not have to do that here :-)

(This used to be commit 49a463a97a4f800977ed3a657714e7f3b17bbf21)

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 14c7eb8fa8b3b07e509e989ce01ad839d7188c01..78630efd449dae9fe6cae8cc5f11fce12e163408 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4807,7 +4807,6 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
        BOOL bad_path = False;
        NTSTATUS status = NT_STATUS_OK;
        struct ea_list *ea_list = NULL;
        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);
 
        if (!CAN_WRITE(conn))
                return ERROR_DOS(ERRSRV,ERRaccess);


@@ -4865,22 +4864,11 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
                                          ERRnoaccess);
        }
 
                                          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 (!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);
        }
                return ERROR_NT(status);
        }

-       close_file(fsp, NORMAL_CLOSE);

   
        /* Try and set any given EA. */
        if (ea_list) {
   
        /* Try and set any given EA. */
        if (ea_list) {