[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  dd0e4c4 smbd: Remove unused create_options from open_mode_check
       via  4c82e83 smbd: Remove name_hash param from open_mode_check
      from  26b1103 s3/time_audit: Add offline and durable functions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dd0e4c47e5004aaceb5ad64115cfe039edb3fe8b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Sep 26 14:42:59 2013 -0700

    smbd: Remove unused create_options from open_mode_check
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Sun Oct 13 14:35:26 CEST 2013 on sn-devel-104

commit 4c82e8358ad8eaac008929aed4fc2a607afeca78
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Sep 26 14:35:15 2013 -0700

    smbd: Remove name_hash param from open_mode_check
    
    This came from delete_on_close handling which was factored out.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 6255180..f6df035 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1121,10 +1121,8 @@ static bool has_delete_on_close(struct share_mode_lock *lck,
 
 static NTSTATUS open_mode_check(connection_struct *conn,
 				struct share_mode_lock *lck,
-				uint32_t name_hash,
 				uint32 access_mask,
 				uint32 share_access,
-				uint32 create_options,
 				bool *file_existed)
 {
 	int i;
@@ -2435,9 +2433,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 		return NT_STATUS_SHARING_VIOLATION;
 	}
 
-	status = open_mode_check(conn, lck, fsp->name_hash,
+	status = open_mode_check(conn, lck,
 				 access_mask, share_access,
-				 create_options, &file_existed);
+				 &file_existed);
 
 	if (NT_STATUS_IS_OK(status)) {
 		/* We might be going to allow this open. Check oplock
@@ -3173,9 +3171,9 @@ static NTSTATUS open_directory(connection_struct *conn,
 		return NT_STATUS_DELETE_PENDING;
 	}
 
-	status = open_mode_check(conn, lck, fsp->name_hash,
+	status = open_mode_check(conn, lck,
 				access_mask, share_access,
-				 create_options, &dir_existed);
+				 &dir_existed);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		TALLOC_FREE(lck);


-- 
Samba Shared Repository